diff options
| author | Richard Linden <none@none> | 2013-01-22 20:46:02 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-22 20:46:02 -0800 |
| commit | d93fe6c4353a6501af2704408d2921181fea6b75 (patch) | |
| tree | 03c380bcad8944130c874665619e918237a2208c /indra/newview/llviewerobjectlist.cpp | |
| parent | 28ab53d0cd1fb43a255990e90e0ad1ee78a566bb (diff) | |
| parent | a4d01f05e054eb0f7cbe2621548429cea70ffe26 (diff) | |
Automated merge with bundle:c:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg.hcdaac\ssh__hg.lindenlab.com_richard_viewer-interesting-metrics_sa6ddo.hg
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 0335cd769b..dce963c5c5 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -657,13 +657,15 @@ void LLViewerObjectList::processCachedObjectUpdate(LLMessageSystem *mesgsys, S32 msg_size = 0; U32 id; U32 crc; + U32 flags; mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_ID, id, i); mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_CRC, crc, i); + mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_UpdateFlags, flags, i); msg_size += sizeof(U32) * 2; // Lookup data packer and add this id to cache miss lists if necessary. U8 cache_miss_type = LLViewerRegion::CACHE_MISS_TYPE_NONE; - if(!regionp->probeCache(id, crc, cache_miss_type)) + if(!regionp->probeCache(id, crc, flags, cache_miss_type)) { // Cache Miss. recorder.cacheMissEvent(id, update_type, cache_miss_type, msg_size); |