diff options
| author | Vir Linden <vir@lindenlab.com> | 2021-10-25 15:55:31 +0000 |
|---|---|---|
| committer | Vir Linden <vir@lindenlab.com> | 2021-10-25 15:55:31 +0000 |
| commit | c173b07b72ac3e30c019cbee8dba53401c781be3 (patch) | |
| tree | 6267b828141028889894be919263c6d19c6e54c1 /indra/newview/llviewerobjectlist.cpp | |
| parent | 3efd4c50a031ce0c1cb3d2fcc43e403136277e1f (diff) | |
| parent | ba3459f77fc9b93c8dd79bc3ac7c59ba792da27f (diff) | |
Merged in SL-15999 (pull request #746)
SL-15999 support --noninteractive option for viewer
Approved-by: Dave Parks
Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 0b20556104..097b5e3645 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -80,6 +80,7 @@ #include "llfloaterperms.h" #include "llvocache.h" #include "llcorehttputil.h" +#include "llstartup.h" #include <algorithm> #include <iterator> @@ -309,7 +310,7 @@ LLViewerObject* LLViewerObjectList::processObjectUpdateFromCache(LLVOCacheEntry* LLDataPacker *cached_dpp = entry->getDP(); - if (!cached_dpp) + if (!cached_dpp || gNonInteractive) { return NULL; //nothing cached. } @@ -2063,7 +2064,6 @@ LLViewerObject *LLViewerObjectList::createObjectFromCache(const LLPCode pcode, L LLViewerObject *LLViewerObjectList::createObject(const LLPCode pcode, LLViewerRegion *regionp, const LLUUID &uuid, const U32 local_id, const LLHost &sender) { - LLUUID fullid; if (uuid == LLUUID::null) { |