diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-09-28 20:20:23 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-09-28 20:20:23 +0100 |
| commit | 542f1917e9e963862088936b819fd9f0c1425541 (patch) | |
| tree | c93fa964ea9f9ca0f1cb4987977db1f0c900f202 /indra/newview | |
| parent | a184a0fbeea8a9dea855dc6e4fd29d81803fa738 (diff) | |
SL-15999 - draw no objects when noninteractive
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 1f59134679..a146f72dde 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2761,6 +2761,7 @@ bool LLAppViewer::initConfiguration() tempSetControl("SLURLPassToOtherInstance", "FALSE"); tempSetControl("RenderWater", "FALSE"); tempSetControl("FlyingAtExit", "FALSE"); + gPipeline.clearAllRenderTypes(); llassert_always(!gSavedSettings.getBOOL("SLURLPassToOtherInstance")); } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 30703426ce..1730753eb1 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -487,10 +487,10 @@ void LLPipeline::init() { clearAllRenderTypes(); } - //else if (gSavedSettings.getBOOL("NonInteractive")) -// { - // clearAllRenderTypes(); - //} + else if (gNonInteractive) + { + clearAllRenderTypes(); + } else { setAllRenderTypes(); // By default, all rendering types start enabled |