Merge with default

--HG--
branch : compatibility

code/CTestConfig.cmake

@@ -8,6 +8,6 @@ set(CTEST_PROJECT_NAME "RyzomCore")
 set(CTEST_NIGHTLY_START_TIME "00:00:00 CST")
 set(CTEST_UPDATE_TYPE "hg")
 set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "www.opennel.org")
-set(CTEST_DROP_LOCATION "/cdash/submit.php?project=RyzomCore")
+set(CTEST_DROP_SITE "ci.ryzomcore.org")
+set(CTEST_DROP_LOCATION "/submit.php?project=RyzomCore")
 set(CTEST_DROP_SITE_CDASH TRUE)

code/ryzom/client/src/init_main_loop.cpp

@@ -148,7 +148,7 @@ bool						UseEscapeDuringLoading = USE_ESCAPE_DURING_LOADING;
 #define	ENTITY_TEXTURE_COARSE_LEVEL		3
 #define	ENTITY_TEXTURE_NORMAL_LEVEL		1
 #define	ENTITY_TEXTURE_HIGH_LEVEL		0
-// Size in Mo of the cache for entity texturing.
+// Size in MB of the cache for entity texturing.
 #define	ENTITY_TEXTURE_NORMAL_MEMORY	10
 #define	ENTITY_TEXTURE_HIGH_MEMORY		40
 

code/ryzom/client/src/interface_v3/interface_manager.cpp

@@ -727,16 +727,6 @@ void CInterfaceManager::initOutGame()
 
 
 	//NLMEMORY::CheckHeap (true);
-	// Initialize the web browser
-	{
-		CGroupHTML *pGH = dynamic_cast<CGroupHTML*>( CWidgetManager::getInstance()->getElementFromId(GROUP_BROWSER));
-		if (pGH)
-		{
-			pGH->setActive(true);
-			pGH->browse(ClientCfg.PatchletUrl.c_str());
-		}
-	}
-
 
 	if (ClientCfg.XMLOutGameInterfaceFiles.size()==0)
 	{
@@ -777,6 +767,17 @@ void CInterfaceManager::initOutGame()
 		initActions();
 	}
 	//NLMEMORY::CheckHeap (true);
+
+	// Initialize the web browser
+	{
+		CGroupHTML *pGH = dynamic_cast<CGroupHTML*>( CWidgetManager::getInstance()->getElementFromId(GROUP_BROWSER));
+
+		if (pGH)
+		{
+			pGH->setActive(true);
+			pGH->browse(ClientCfg.PatchletUrl.c_str());
+		}
+	}
 }
 
 // ------------------------------------------------------------------------------------------------

code/ryzom/tools/client/client_patcher/main.cpp

@@ -28,9 +28,6 @@ string	VersionName;
 string LoginLogin, LoginPassword;
 uint32 LoginShardId = 0xFFFFFFFF;
 
-// stuff which is defined in other .cpp files
-extern void tmpFlagRemovedPatchCategories(NLMISC::CConfigFile &cf);
-
 bool useUtf8 = false;
 bool useEsc = false;
 
@@ -270,20 +267,6 @@ int main(int argc, char *argv[])
 
 	printf("Checking %s files to patch...\n", convert(CI18N::get("TheSagaOfRyzom")).c_str());
 
-#ifdef NL_OS_UNIX
-	// don't use cfg, exe and dll from Windows version
-	CConfigFile::CVar var;
-	var.Type = CConfigFile::CVar::T_STRING;
-	std::vector<std::string> cats;
-	cats.push_back("main_exedll");
-	cats.push_back("main_cfg");
-	var.setAsString(cats);
-	ClientCfg.ConfigFile.insertVar("RemovePatchCategories", var);
-
-	// add categories to remove
-	tmpFlagRemovedPatchCategories(ClientCfg.ConfigFile);
-#endif
-
 	// initialize patch manager and set the ryzom full path, before it's used
 	CPatchManager *pPM = CPatchManager::getInstance();