summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2023-03-23 14:16:52 -0500
committerDave Parks <davep@lindenlab.com>2023-03-23 14:16:52 -0500
commit82125e8fba67de32f43d4a1c2290f2eec6a1d5e2 (patch)
treeab85088f549f5f83302e776574f0383fb8015246
parent81bccc05e296b80163bf28aea537e9ded2a0927e (diff)
SL-18458 Fix for overrides not applying when zooming out and back in again.
-rwxr-xr-xindra/newview/llviewerregion.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index afe48f01b5..4663129d35 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1862,6 +1862,9 @@ LLViewerObject* LLViewerRegion::addNewObject(LLVOCacheEntry* entry)
//should not hit here any more, but does not hurt either, just put it back to active list
addActiveCacheEntry(entry);
}
+
+ loadCacheMiscExtras(entry->getLocalID(), entry, entry->getCRC());
+
return obj;
}
@@ -2759,7 +2762,7 @@ bool LLViewerRegion::probeCache(U32 local_id, U32 crc, U32 flags, U8 &cache_miss
entry->setValid();
decodeBoundingInfo(entry);
- loadCacheMiscExtras(local_id, entry, crc);
+ //loadCacheMiscExtras(local_id, entry, crc);
return true;
}