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/pipeline.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/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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 |