From f6b770d062d4a1c88ada3ddded88bd60168751e7 Mon Sep 17 00:00:00 2001 From: "Graham Linden graham@lindenlab.com" Date: Thu, 15 Feb 2018 23:23:46 +0000 Subject: Mark RenderNsightDebugSupport as requiring restart (because it does). Remove nerfing of message to run SL_Launcher. --- indra/newview/app_settings/settings.xml | 2 +- indra/newview/llappviewer.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0cce614a1f..756e4b6616 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8635,7 +8635,7 @@ Comment - Disable features which prevent nVidia nSight from being usable with SL + Disable features which prevent nVidia nSight from being usable with SL. Requires restart. Persist 1 diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 2b0b8064bd..a0750214a8 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1101,7 +1101,6 @@ bool LLAppViewer::init() } } -#if LL_RELEASE_FOR_DOWNLOAD char* PARENT = getenv("PARENT"); if (! (PARENT && std::string(PARENT) == "SL_Launcher")) { @@ -1114,7 +1113,6 @@ bool LLAppViewer::init() // him/herself in the foot. LLNotificationsUtil::add("RunLauncher"); } -#endif #if LL_WINDOWS if (gGLManager.mGLVersion < LLFeatureManager::getInstance()->getExpectedGLVersion()) -- cgit v1.2.3