Skip to content
Snippets Groups Projects
Commit bfc7785d authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into cronchy

parents d432a89c 82125e8f
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
...@@ -1906,6 +1906,9 @@ LLViewerObject* LLViewerRegion::addNewObject(LLVOCacheEntry* entry) ...@@ -1906,6 +1906,9 @@ LLViewerObject* LLViewerRegion::addNewObject(LLVOCacheEntry* entry)
//should not hit here any more, but does not hurt either, just put it back to active list //should not hit here any more, but does not hurt either, just put it back to active list
addActiveCacheEntry(entry); addActiveCacheEntry(entry);
} }
loadCacheMiscExtras(entry->getLocalID(), entry, entry->getCRC());
return obj; return obj;
} }
...@@ -2987,7 +2990,7 @@ bool LLViewerRegion::probeCache(U32 local_id, U32 crc, U32 flags, U8 &cache_miss ...@@ -2987,7 +2990,7 @@ bool LLViewerRegion::probeCache(U32 local_id, U32 crc, U32 flags, U8 &cache_miss
entry->setValid(); entry->setValid();
decodeBoundingInfo(entry); decodeBoundingInfo(entry);
loadCacheMiscExtras(local_id, entry, crc); //loadCacheMiscExtras(local_id, entry, crc);
return true; return true;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment