Default merge

--HG--
branch : compatibility

code/nel/src/gui/ctrl_col_pick.cpp

@@ -210,7 +210,7 @@ namespace NLGUI
 		}
 
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onchange" );
-		if (prop)	_AHOnChange = NLMISC::toLower(prop);
+		if (prop)	_AHOnChange = NLMISC::toLower((const char*)prop);
 		prop = (char*) xmlGetProp( node, (xmlChar*)"onchange_params" );
 		if (prop)	_AHOnChangeParams = string((const char*)prop);
 

code/ryzom/client/src/client_cfg.cpp

@@ -327,13 +327,13 @@ CClientConfig::CClientConfig()
 	TexturesLoginInterface.push_back("texture_interfaces_v3_login");
 
 	DisplayAccountButtons = true;
-	CreateAccountURL	= "https://secure.ryzom.com/signup/from_client.php";
+	CreateAccountURL	= "http://shard.ryzomcore.org/ams/index.php?page=register";
 	ConditionsTermsURL	= "https://secure.ryzom.com/signup/terms_of_use.php";
-	EditAccountURL		= "https://secure.ryzom.com/payment_profile/index.php";
+	EditAccountURL		= "http://shard.ryzomcore.org/ams/index.php?page=settings";
 	BetaAccountURL		= "http://www.ryzom.com/profile";
-	ForgetPwdURL		= "https://secure.ryzom.com/payment_profile/lost_secure_password.php";
+	ForgetPwdURL		= "http://shard.ryzomcore.org/ams/index.php?page=forgot_password";
 	FreeTrialURL		= "http://www.ryzom.com/join/?freetrial=1";
-	LoginSupportURL		= "http://www.ryzom.com/en/support.html";
+	LoginSupportURL		= "http://shard.ryzomcore.org/ams/index.php";
 	Position			= CVector(0.f, 0.f, 0.f);	// Default Position.
 	Heading				= CVector(0.f, 1.f, 0.f);	// Default Heading.
 	EyesHeight			= 1.5f;						// Default User Eyes Height.
@@ -889,6 +889,14 @@ void CClientConfig::setValues()
 	READ_STRING_DEV(FreeTrialURL)
 	READ_STRING_DEV(LoginSupportURL)
 	
+	READ_STRING_FV(CreateAccountURL)
+	READ_STRING_FV(EditAccountURL)
+	READ_STRING_FV(ConditionsTermsURL)
+	READ_STRING_FV(BetaAccountURL)
+	READ_STRING_FV(ForgetPwdURL)
+	READ_STRING_FV(FreeTrialURL)
+	READ_STRING_FV(LoginSupportURL)
+
 #ifndef RZ_NO_CLIENT
 	// if cookie is not empty, it means that the client was launch
 	// by the nel_launcher, so it can't be local
@@ -1051,17 +1059,24 @@ void CClientConfig::setValues()
 	/////////////////////////
 	// NEW PATCHING SYSTEM //
 	READ_BOOL_FV(PatchWanted)
+	READ_STRING_FV(PatchServer)
+	READ_STRING_FV(PatchUrl)
+	READ_STRING_FV(PatchVersion)
+	READ_STRING_FV(RingReleaseNotePath)
+	READ_STRING_FV(ReleaseNotePath)
+	READ_BOOL_DEV(PatchWanted)
+	READ_STRING_DEV(PatchServer)
 	READ_STRING_DEV(PatchUrl)
 	READ_STRING_DEV(PatchVersion)
 	READ_STRING_DEV(RingReleaseNotePath)
 	READ_STRING_DEV(ReleaseNotePath)
-	READ_STRING_FV(PatchServer)
+
 
 	/////////////////////////
 	// NEW PATCHLET SYSTEM //	
 	READ_STRING_FV(PatchletUrl)
 
-	///////////
+	////////////////////////
 	// WEBIG //
 	READ_STRING_FV(WebIgMainDomain);
 	READ_STRINGVECTOR_FV(WebIgTrustedDomains);
@@ -2196,24 +2211,28 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
 	std::string defaultConfigFileName = "client_default.cfg";
 	std::string defaultConfigPath;
 	
-	p_name.clear();
+	p_name = std::string();
 	
 #ifdef NL_OS_MAC
 	// on mac, client_default.cfg should be searched in .app/Contents/Resources/
-	defaultConfigPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/");
+	defaultConfigPath = 
+		CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/");
+
 #elif defined(RYZOM_ETC_PREFIX)
 	// if RYZOM_ETC_PREFIX is defined, client_default.cfg might be over there
 	defaultConfigPath = CPath::standardizePath(RYZOM_ETC_PREFIX);
+
 #else
 	// some other prefix here :)
+
 #endif // RYZOM_ETC_PREFIX
 
 	// look in the current working directory first
-	if (CFile::isExists(defaultConfigFileName))
+	if(CFile::isExists(defaultConfigFileName))
 		p_name = defaultConfigFileName;
 
 	// if not in working directory, check using prefix path
-	else if (CFile::isExists(defaultConfigPath + defaultConfigFileName))
+	else if(CFile::isExists(defaultConfigPath + defaultConfigFileName))
 		p_name = defaultConfigPath + defaultConfigFileName;
 
 	// if some client_default.cfg was found return true