Merge

code/ryzom/common/src/game_share/server_edition_module.cpp

@@ -96,7 +96,7 @@ CVariable<uint32> TimeBeforeCloseHibernatingEditionSession("DSS", "TimeBeforeClo
 CVariable<uint32> TimeBeforeAutoCloseAnimationSessionWithNoPlayer("DSS", "TimeBeforeAutoCloseAnimationSessionWithNoPlayer", "Delay in secondes before a empty animation session is closed", 15*60, 0, true);
 
 CVariable<std::string>	DefaultCharRingAccess( "DSS", "DefaultCharRingAccess", "Default Access Ring for player eg 'f1:j1:l1:d1:p1:g1:a1:'", "a1", 0, true );
-CVariable<bool>	DontUseSU( "DSS", "DontUseSU", "Simulate the SU", false, 0, true );
+CVariable<bool>	DontUseSU( "DSS", "DontUseSU", "If 1, allow running a shard with no Shard Unifier Service", false, 0, true );
 
 CVariable<bool> AcceptScenarioWithoutHeader("DSS", "AcceptScenarioWithoutHeader", "AcceptScenarioWithoutHeader", false, 0, true);
 CVariable<bool> MustVerifyRingAccessWhileLoadingAnimation("DSS", "MustVerifyRingAccessWhileLoadingAnimation", "MustVerifyRingAccessWhileLoadingAnimation", false, 0, true);

code/ryzom/server/src/ai_service/ai_script_data_manager.cpp

@@ -97,7 +97,8 @@ void cbOnSaveShardRootModified( NLMISC::IVariable& var )
 }
 
 
-CVariable<string>	SaveShardRoot2("variables", "SaveShardRoot2", "Root directory of all saved data by any shard", "/home/nevrax/save_shard", 0, true, cbOnSaveShardRootModified); // (SaveShardRoot from game_share/backup_service_interface.cpp is not instanciated because nothing is used from that file)
+// (SaveShardRoot from game_share/backup_service_interface.cpp is not instanciated because nothing is used from that file)
+extern NLMISC::CVariable<std::string> SaveShardRoot;
 CVariable<string>	PdrFilename("ai", "PdrFilename", "Pdr file containing AIScript variables", string("ai_persistent_var.pdr"), 0, true);
 
 
@@ -173,7 +174,7 @@ CAIScriptDataManager::~CAIScriptDataManager()
 
 std::string CAIScriptDataManager::dirname()
 {
-	return SaveShardRoot2.get()+"/"+IService::getInstance()->SaveFilesDirectory.toString()+"/ai_script_data";
+	return SaveShardRoot.get()+"/"+IService::getInstance()->SaveFilesDirectory.toString()+"/ai_script_data";
 }
 
 //CConfigFile* CAIScriptDataManager::createFile(string name)

code/ryzom/server/src/backup_service/web_connection.cpp

@@ -169,7 +169,8 @@ void cbOnSaveShardRootModified( NLMISC::IVariable& var )
 }
 
 CVariable<string>	IncrementalBackupDirectory("backup", "IncrementalBackupDirectory", "Directory to find incremental backuped archives", "", 0, true);
-CVariable<string>	SaveShardRoot("backup", "SaveShardRoot", "Root directory of all saved data by BS", "/home/nevrax/save_shard", 0, true, cbOnSaveShardRootModified); // (SaveShardRoot from game_share/backup_service_interface.cpp is not instanciated because the nothing is used from that file)
+// (SaveShardRoot from game_share/backup_service_interface.cpp is not instanciated because the nothing is used from that file)
+extern CVariable<string>	SaveShardRoot;
 CVariable<string>	SaveTemplatePath("backup", "SaveTemplatePath", "Directory to find saves (with shard and account replacement strings)", "$shard/characters/account_$userid_$charid$ext", 0, true);
 CVariable<string>	SaveExtList("backup", "SaveExtList", "List of possible extensions for save files (space separated)", "_pdr.bin _pdr.xml .bin", 0, true);
 

code/ryzom/server/src/entities_game_service/modules/shard_unifier_client.cpp

@@ -54,7 +54,7 @@ using namespace ENTITYLOC;
 
 extern NLMISC::CVariable<uint32> FixedSessionId;
 
-CVariable<bool> DontUseSU( "su", "DontUseSU", "If 1, allow running a shard with no Shard Unifier Service", 0, 0, 1 ); 
+extern CVariable<bool> DontUseSU;
 CVariable<bool> SimulateCharacterHasEditSession( "su", "SimulateCharacterHasEditSession", "If 1 simulate that character have alreay an edition sessiion", 0, 0, 1 ); 
 
 

code/ryzom/server/src/frontend_service/fe_receive_sub.cpp

@@ -75,7 +75,7 @@ extern void flushMessagesToSend();
 void cbGwTrDisconnection ( TClientId clientId );
 
 
-CVariable<string>	SaveShardRoot("variables", "SaveShardRoot", "Root directory of all files saved by any shard", "", 0, true, NULL, false);
+extern CVariable<string>	SaveShardRoot;
 extern CVariable<bool>		VerboseFEStatsTime;