Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-13 03:22:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Moved DataRate interface from rsiface (old) -> rsConfig.

Browse source 
* Internally moved storage of data rate from pqipersongroup -> p3serverconfig
 * made DataRate + Operating Mode work together.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5889 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-11-25 20:25:34 +00:00
parent 0fa8d55062
commit de80f2aa3e
10 changed files with 113 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libretroshare/src/rsserver/rsinit.cc
View file

@ -2407,9 +2407,8 @@ int RsServer::StartupRetroShare()
/**************************************************************************/
/* trigger generalConfig loading for classes that require it */
/**************************************************************************/
pqih->setConfig(mGeneralConfig);
pqih->load_config();
p3ServerConfig *serverConfig = new p3ServerConfig(mPeerMgr, mLinkMgr, mNetMgr, pqih, mGeneralConfig);
serverConfig->load_config();
/**************************************************************************/
/* Force Any Configuration before Startup (After Load) */
@ -2543,7 +2542,7 @@ int RsServer::StartupRetroShare()
rsDisc = new p3Discovery(ad);
rsBandwidthControl = mBwCtrl;
rsConfig = new p3ServerConfig(mPeerMgr, mLinkMgr, mNetMgr, mGeneralConfig);
rsConfig = serverConfig;
rsMsgs = new p3Msgs(msgSrv, chatSrv);
rsForums = mForums;