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

SL-16644 OUT_FULL updates should reset cache

parent 07358a4f
No related branches found
No related tags found
No related merge requests found
......@@ -580,7 +580,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
if(update_cache)
{
objectp = regionp->updateCacheEntry(local_id, objectp, update_type);
objectp = regionp->updateCacheEntry(local_id, objectp);
}
// This looks like it will break if the local_id of the object doesn't change
......
......@@ -1783,13 +1783,8 @@ LLViewerObject* LLViewerRegion::addNewObject(LLVOCacheEntry* entry)
//update object cache if the object receives a full-update or terse update
//update_type == EObjectUpdateType::OUT_TERSE_IMPROVED or EObjectUpdateType::OUT_FULL
LLViewerObject* LLViewerRegion::updateCacheEntry(U32 local_id, LLViewerObject* objectp, U32 update_type)
LLViewerObject* LLViewerRegion::updateCacheEntry(U32 local_id, LLViewerObject* objectp)
{
if(objectp && update_type != (U32)OUT_TERSE_IMPROVED)
{
return objectp; //no need to access cache
}
LLVOCacheEntry* entry = getCacheEntry(local_id);
if (!entry)
{
......@@ -1801,11 +1796,8 @@ LLViewerObject* LLViewerRegion::updateCacheEntry(U32 local_id, LLViewerObject* o
objectp = addNewObject(entry);
}
//remove from cache if terse update
if(update_type == (U32)OUT_TERSE_IMPROVED)
{
killCacheEntry(entry, true);
}
//remove from cache.
killCacheEntry(entry, true);
return objectp;
}
......
......@@ -353,7 +353,7 @@ class LLViewerRegion final : public LLCapabilityProvider // implements this inte
void requestCacheMisses();
void addCacheMissFull(const U32 local_id);
//update object cache if the object receives a full-update or terse update
LLViewerObject* updateCacheEntry(U32 local_id, LLViewerObject* objectp, U32 update_type);
LLViewerObject* updateCacheEntry(U32 local_id, LLViewerObject* objectp);
void findOrphans(U32 parent_id);
void clearCachedVisibleObjects();
void dumpCache();
......
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