diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-09-20 13:19:20 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-09-20 13:19:20 +0100 |
| commit | c10d601ce8d2a6ca7e354772a217a998cd9865b3 (patch) | |
| tree | 7354113b30b20c879dec9f308c2d2c79224be31e /indra/newview/llviewerobject.cpp | |
| parent | 0918958507c9140cca0f4026ecef210eac9aef3a (diff) | |
SL-15999 - track --noninteractive state with gNonInteractive flag
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 1852d4980f..528448c477 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -107,6 +107,7 @@ #include "llcleanup.h" #include "llcallstack.h" #include "llmeshrepository.h" +#include "llgl.h" //#define DEBUG_UPDATE_TYPE @@ -153,8 +154,6 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco LL_DEBUGS("ObjectUpdate") << "creating " << id << LL_ENDL; dumpStack("ObjectUpdateStack"); - static LLCachedControl<bool> s_non_interactive(gSavedSettings, "NonInteractive", false); - LLViewerObject *res = NULL; LL_RECORD_BLOCK_TIME(FTM_CREATE_OBJECT); @@ -162,7 +161,7 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco { case LL_PCODE_VOLUME: { - if (!s_non_interactive) + if (!gNonInteractive) { res = new LLVOVolume(id, pcode, regionp); break; } @@ -201,7 +200,7 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco } else { - if (!s_non_interactive) + if (!gNonInteractive) { LLVOAvatar *avatar = new LLVOAvatar(id, pcode, regionp); avatar->initInstance(); |