diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-07 23:06:43 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-07 23:06:43 +0100 |
| commit | 3b6bf06ee1c88b4c7fb617358d34c69529b11878 (patch) | |
| tree | 069b06e7068d46602a3c3f0a5e6d2f06aac3cd06 /indra/newview/llappviewer.cpp | |
| parent | 1fe32c16fb299c1eb6a47e6860198f07b0c806c4 (diff) | |
| parent | 88da45148eeae26e1bae11bf3c948796e0f7cfdb (diff) | |
MAINT-8724 fix crash in libc++abi demangling on OSX 10.14 Mojave
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..c212ff947d 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()) |