Merge from Git repository

--HG--
branch : develop

code/nel/src/misc/debug.cpp

@@ -1048,9 +1048,9 @@ void getCallStack(std::string &result, sint skipNFirst)
 }
 
 
-void getCallStackAndLog (string &result, sint /* skipNFirst */)
+void getCallStackAndLog (string &result, sint skipNFirst)
 {
-	//getCallStack(result, skipNFirst);
+	getCallStack(result, skipNFirst);
 //#ifdef NL_OS_WINDOWS
 //	try
 //	{

code/ryzom/client/client_default.cfg

@@ -46,8 +46,11 @@ StartupPage = "/login/r2_login.php";
 StartupVerify = 1;
 
 ConditionsTermsURL = "http://www.gnu.org/licenses/agpl-3.0.html";
-LoginSupportURL    = "https://open.ryzom.dev/ams/";
+LoginSupportURL = "https://open.ryzom.dev/ams/";
-NamingPolicyURL    = "https://open.ryzom.dev/ams/";
+NamingPolicyURL = "https://open.ryzom.dev/ams/";
+ForgetPwdURL = "https://open.ryzom.dev/ams/";
+InstallWebPage = "https://open.ryzom.dev/ams/";
+StreamedPackageHosts = { "https://cdn.ryzom.dev/open/stream/" };
 
 // Full path and filename where cURL can find certificate bundle file
 // cacert.pem file can be downloaded from https://curl.haxx.se/docs/caextract.html

code/ryzom/client/src/client.cpp

@@ -158,8 +158,8 @@ int main(int argc, char **argv)
 	// init the Nel context
 	CApplicationContext *appContext = new CApplicationContext;
 
-	// disable nldebug messages in logs in Release
+	// disable nldebug messages in logs in FV
-#ifdef NL_RELEASE
+#if FINAL_VERSION && defined(NL_RELEASE)
 	DisableNLDebug = true;
 #endif
 

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

@@ -191,7 +191,7 @@ struct CClientPatcherTranslations : public NLMISC::CI18N::ILoadProxy
 };
 
 // hardcoded URL to not depend on external files
-static const std::string PatchUrl = "http://dl.ryzom.com/patch_live";
+static const std::string PatchUrl = "https://cdn.ryzom.dev/open/patch";
 
 int main(int argc, char *argv[])
 {