From c330067f194b6ff2ed8dc4faff4bd2f651f67c23 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sun, 17 Nov 2019 06:32:21 +0800 Subject: [PATCH 1/3] Set patch urls --- code/ryzom/client/client_default.cfg | 7 +++++-- code/ryzom/tools/client/client_patcher/main.cpp | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg index b99c5d154..501e0097d 100644 --- a/code/ryzom/client/client_default.cfg +++ b/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/"; -NamingPolicyURL = "https://open.ryzom.dev/ams/"; +LoginSupportURL = "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 diff --git a/code/ryzom/tools/client/client_patcher/main.cpp b/code/ryzom/tools/client/client_patcher/main.cpp index fc440abf4..0c1a13832 100644 --- a/code/ryzom/tools/client/client_patcher/main.cpp +++ b/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[]) { From 830803cfe9d83b3b1a86b640dda48925c7ffbe24 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sun, 17 Nov 2019 16:36:42 +0800 Subject: [PATCH 2/3] Debug logs should not be disabled in DEV client... --- code/ryzom/client/src/client.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ryzom/client/src/client.cpp b/code/ryzom/client/src/client.cpp index 69559e0e8..2dbdced45 100644 --- a/code/ryzom/client/src/client.cpp +++ b/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 -#ifdef NL_RELEASE + // disable nldebug messages in logs in FV +#if FINAL_VERSION && defined(NL_RELEASE) DisableNLDebug = true; #endif From 057b3ab11b8860a6b85a9e0e9c0815cb4278d298 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Mon, 18 Nov 2019 07:13:56 +0800 Subject: [PATCH 3/3] Enable callstack logging --- code/nel/src/misc/debug.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/nel/src/misc/debug.cpp b/code/nel/src/misc/debug.cpp index 260834200..71da430de 100644 --- a/code/nel/src/misc/debug.cpp +++ b/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 // {