diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-12-04 12:36:28 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-12-04 12:36:28 -0700 |
| commit | 4a3e01f8dc1e8cf38183c9be564c7f4fa5dd49d3 (patch) | |
| tree | 4f388c785352c825f9a8ab2402fea063a2d0f2c8 /indra/newview/llviewerobjectlist.cpp | |
| parent | d8e92867162f8c4ff9489d8eefde53546e907dff (diff) | |
fix for SH-4631: Parts of linked objects are not shown in new release Second Life 3.6.11
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rwxr-xr-x | indra/newview/llviewerobjectlist.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 173473dded..5212ab3651 100755 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -458,7 +458,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys, LLTimer update_timer; BOOL justCreated = FALSE; S32 msg_size = 0; - bool remove_from_cache = false; //remove from object cache if it is a full-update or terse update + bool update_cache = false; //update object cache if it is a full-update or terse update if (compressed) { @@ -486,9 +486,9 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys, continue; } } - else + else //OUT_TERSE_IMPROVED { - remove_from_cache = true; + update_cache = true; compressed_dp.unpackU32(local_id, "LocalID"); getUUIDFromLocal(fullid, local_id, @@ -518,7 +518,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys, } else // OUT_FULL only? { - remove_from_cache = true; + update_cache = true; mesgsys->getUUIDFast(_PREHASH_ObjectData, _PREHASH_FullID, fullid, i); mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_ID, local_id, i); msg_size += sizeof(LLUUID); @@ -527,9 +527,9 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys, } objectp = findObject(fullid); - if(remove_from_cache) + if(update_cache) { - objectp = regionp->forceToRemoveFromCache(local_id, objectp); + objectp = regionp->updateCacheEntry(local_id, objectp, update_type); } // This looks like it will break if the local_id of the object doesn't change |