Mark RenderNsightDebugSupport as requiring restart (because it does).

Thu, 15 Feb 2018 23:23:46 +0000

author
Graham Linden graham@lindenlab.com
date
Thu, 15 Feb 2018 23:23:46 +0000
changeset 55288
ef907fd4ba25
parent 55287
09ebe35bb9fb
child 55289
633897a9e4df

Mark RenderNsightDebugSupport as requiring restart (because it does).
Remove nerfing of message to run SL_Launcher.

indra/newview/app_settings/settings.xml file | annotate | diff | revisions
indra/newview/llappviewer.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/app_settings/settings.xml	Thu Feb 15 21:55:24 2018 +0000
     1.2 +++ b/indra/newview/app_settings/settings.xml	Thu Feb 15 23:23:46 2018 +0000
     1.3 @@ -8635,7 +8635,7 @@
     1.4    <map>
     1.5      <key>Comment</key>
     1.6      <string>
     1.7 -      Disable features which prevent nVidia nSight from being usable with SL
     1.8 +      Disable features which prevent nVidia nSight from being usable with SL. Requires restart.
     1.9      </string>
    1.10      <key>Persist</key>
    1.11      <integer>1</integer>
     2.1 --- a/indra/newview/llappviewer.cpp	Thu Feb 15 21:55:24 2018 +0000
     2.2 +++ b/indra/newview/llappviewer.cpp	Thu Feb 15 23:23:46 2018 +0000
     2.3 @@ -1101,7 +1101,6 @@
     2.4  		}
     2.5  	}
     2.6  
     2.7 -#if LL_RELEASE_FOR_DOWNLOAD
     2.8  	char* PARENT = getenv("PARENT");
     2.9  	if (! (PARENT && std::string(PARENT) == "SL_Launcher"))
    2.10  	{
    2.11 @@ -1114,7 +1113,6 @@
    2.12  		// him/herself in the foot.
    2.13  		LLNotificationsUtil::add("RunLauncher");
    2.14  	}
    2.15 -#endif
    2.16  
    2.17  #if LL_WINDOWS
    2.18  	if (gGLManager.mGLVersion < LLFeatureManager::getInstance()->getExpectedGLVersion())

mercurial