diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-06-21 16:47:00 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-06-21 16:47:00 +0100 |
| commit | 4274d12fdef3425297d0a684859b2fdcd7247978 (patch) | |
| tree | 0d2000aaf6347f1f17797198f40bf1021b7cd23f /indra/newview | |
| parent | 9d7b353cbb5c12cd74559a8f3a7365312f95d4d0 (diff) | |
merge fix - omit SL_Launcher check if beingDebugged()
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index f705084bdb..f587255bbf 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1083,7 +1083,7 @@ bool LLAppViewer::init() } // MAINT-8305: If we're processing a SLURL, skip the launcher check. - if (gSavedSettings.getString("CmdLineLoginLocation").empty()) + if (gSavedSettings.getString("CmdLineLoginLocation").empty() && !beingDebugged()) { const char* PARENT = getenv("PARENT"); if (! (PARENT && std::string(PARENT) == "SL_Launcher")) |