diff options
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
2 files changed, 1 insertions, 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 @@ <map> <key>Comment</key> <string> - Disable features which prevent nVidia nSight from being usable with SL + Disable features which prevent nVidia nSight from being usable with SL. Requires restart. </string> <key>Persist</key> <integer>1</integer> 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()) |