diff options
author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2018-07-02 15:10:54 +0300 |
---|---|---|
committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2018-07-02 15:10:54 +0300 |
commit | 27b5ee16f29e2fd3377b343362443075638e059a (patch) | |
tree | 6f4d1d3dc6c8146f44dafcb03656c45adfc32adf /indra/newview/llappviewer.cpp | |
parent | 3991a0f765d3d493bcc08ac2aadc707934f4d640 (diff) | |
parent | 3008962f0c990f4bfd270bee38152d2531ddfcd2 (diff) |
Merged lindenlab/viewer-cougar into default
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 f705084bdb..261a78b2dc 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1082,6 +1082,8 @@ bool LLAppViewer::init() } } +// do not pester devs who need to run the executable directly to debug +#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()) |