From bbfb7b9ea1dc025d672968e39908b2327d14878a Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 20 Mar 2013 22:49:45 -0600 Subject: for SH-3918: Viewer should respond to cache probes in order received (don't sort response) --- indra/newview/llviewerregion.cpp | 4 ++++ indra/newview/llviewerregion.h | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'indra') 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 cache_miss_list_t; +#else + typedef std::list cache_miss_list_t; +#endif }; CacheMissItem::cache_miss_list_t mCacheMissList; -- cgit v1.2.3