diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-09-29 16:50:57 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-09-29 16:50:57 +0100 |
| commit | 19154bec157a4e05c8b988531e84095a8124d3ec (patch) | |
| tree | f09c2641c65ef410117eb2344ce3454154630080 /indra/newview/llappviewer.cpp | |
| parent | 3c4198e4b50de0221020f3b5bbf7d3f7ff7cf984 (diff) | |
| parent | 391500b5f7f2fb251acdd192d80e1da7eea02c4c (diff) | |
Merge branch 'SL-15999' of ssh://bitbucket.org/lindenlab/viewer into SL-15999
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index bd1b30b4a1..e1fbbf6ce5 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2632,9 +2632,10 @@ bool LLAppViewer::initConfiguration() disableCrashlogger(); } + gNonInteractive = gSavedSettings.getBOOL("NonInteractive"); // Handle initialization from settings. // Start up the debugging console before handling other options. - if (gSavedSettings.getBOOL("ShowConsoleWindow")) + if (gSavedSettings.getBOOL("ShowConsoleWindow") && !gNonInteractive) { initConsole(); } @@ -2755,7 +2756,6 @@ bool LLAppViewer::initConfiguration() } } - gNonInteractive = gSavedSettings.getBOOL("NonInteractive"); if (gNonInteractive) { tempSetControl("SLURLPassToOtherInstance", "FALSE"); |