diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-28 09:24:58 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-28 09:24:58 -0700 |
| commit | 1eda16b31989448a211808a8144f0a5ffb0bce49 (patch) | |
| tree | 27333cfb8cdaf28b69e579a87a6f3c321065bafc /indra/newview/llappviewer.cpp | |
| parent | 438d97714778ebb8728f0ac3808f0b8f98afc1fa (diff) | |
| parent | 0ff65651cc219eef959c5e961663de2a07595e5a (diff) | |
Merge
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 7d7340fde2..874940b87f 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1083,6 +1083,8 @@ bool LLAppViewer::init() } } +// do not pester developers with instructions they cannot follow while debugging +#if LL_RELEASE_FOR_DOWNLOAD // MAINT-8305: If we're processing a SLURL, skip the launcher check. if (gSavedSettings.getString("CmdLineLoginLocation").empty()) { @@ -1099,6 +1101,7 @@ bool LLAppViewer::init() LLNotificationsUtil::add("RunLauncher"); } } +#endif #if LL_WINDOWS if (gGLManager.mGLVersion < LLFeatureManager::getInstance()->getExpectedGLVersion()) |