diff options
| author | Callum Linden <callum@lindenlab.com> | 2021-09-28 15:25:12 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2021-09-28 15:25:12 -0700 |
| commit | 89057746316affe2fef7314624942fa43085d6b6 (patch) | |
| tree | 6187d3d751c13f46b571b10908e5d56f3febff94 /indra/newview/llappviewer.cpp | |
| parent | 851fef680164e3472b0516e7237bbcc4a35bc5a3 (diff) | |
| parent | 187d5862398820e28a8935ce9058f444f4963153 (diff) | |
Merge branch 'SL-15999' of https://bitbucket.org/lindenlab/viewer into SL-15999
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index b6446e40ac..5413045e7a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1559,7 +1559,7 @@ bool LLAppViewer::doFrame() if (gNonInteractive) { - S32 non_interactive_ms_sleep_time = 1000; + S32 non_interactive_ms_sleep_time = 100; LLAppViewer::getTextureCache()->pause(); LLAppViewer::getImageDecodeThread()->pause(); ms_sleep(non_interactive_ms_sleep_time); @@ -2759,6 +2759,9 @@ bool LLAppViewer::initConfiguration() if (gNonInteractive) { tempSetControl("SLURLPassToOtherInstance", "FALSE"); + tempSetControl("RenderWater", "FALSE"); + tempSetControl("FlyingAtExit", "FALSE"); + LLError::setEnabledLogTypesMask(0); llassert_always(!gSavedSettings.getBOOL("SLURLPassToOtherInstance")); } |