diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-03-20 22:49:45 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-03-20 22:49:45 -0600 |
| commit | bbfb7b9ea1dc025d672968e39908b2327d14878a (patch) | |
| tree | 7f6b6a216a5c82ee8e852b1ad4c8458d94c6171a | |
| parent | 933691ad133b552be3fdd26b0d9d26a09c3a7aa5 (diff) | |
for SH-3918: Viewer should respond to cache probes in order received (don't sort response)
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewerregion.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index bca2108964..b052c87064 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1898,7 +1898,11 @@ LLVOCacheEntry* LLViewerRegion::getCacheEntry(U32 local_id) void LLViewerRegion::addCacheMiss(U32 id, LLViewerRegion::eCacheMissType miss_type) { +#if 0 mCacheMissList.insert(CacheMissItem(id, miss_type)); +#else + mCacheMissList.push_back(CacheMissItem(id, miss_type)); +#endif } // Get data packer for this object, if we have cached data diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 15c2b36e38..22936fb103 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -470,6 +470,7 @@ private: U32 mID; //local object id LLViewerRegion::eCacheMissType mType; //cache miss type +#if 0 struct Compare { bool operator()(const CacheMissItem& lhs, const CacheMissItem& rhs) @@ -479,6 +480,9 @@ private: }; typedef std::set<CacheMissItem, Compare> cache_miss_list_t; +#else + typedef std::list<CacheMissItem> cache_miss_list_t; +#endif }; CacheMissItem::cache_miss_list_t mCacheMissList; |