diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-06-08 20:02:13 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-06-08 20:02:13 +0300 |
| commit | 2761c1c7c2fdb6cbfe610be7e2f4f8753271d36f (patch) | |
| tree | da3cbabf2f3125fb630905a54fca334642770edd /indra/newview/llappviewer.cpp | |
| parent | 1a024f04cd721ad27836927af6616bf44e611017 (diff) | |
| parent | b26dbf562f43deea780e4ab615b2b5608c3c5d60 (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 59572ea9b6..b9e2657351 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1082,6 +1082,8 @@ bool LLAppViewer::init() } } +// don't nag developers who need to run the executable directly +#if LL_RELEASE_FOR_DOWNLOAD // MAINT-8305: If we're processing a SLURL, skip the launcher check. if (gSavedSettings.getString("CmdLineLoginLocation").empty()) { @@ -1098,6 +1100,7 @@ bool LLAppViewer::init() LLNotificationsUtil::add("RunLauncher"); } } +#endif #if LL_WINDOWS if (gGLManager.mGLVersion < LLFeatureManager::getInstance()->getExpectedGLVersion()) |