summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-09-10 11:51:55 -0700
committerMerov Linden <merov@lindenlab.com>2010-09-10 11:51:55 -0700
commit807aec7bafe19fca75a8f3980bd621fad7c8338e (patch)
treef2e120963ff103524ef6206506c1ee9e0bdd3a2d /indra/newview/llviewerregion.h
parent19026c621e338040df59adabdf7055924271f66d (diff)
parent1f46b1d87bf4664e62131e7823ab5a7fcafe4b73 (diff)
Pull from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llviewerregion.h')
-rw-r--r--indra/newview/llviewerregion.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 361ae87e1b..038c831e59 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -323,9 +323,6 @@ public:
LLDynamicArray<LLUUID> mMapAvatarIDs;
private:
- // determine the cache filename for the region from the region handle
- const std::string getObjectCacheFilename(U64 mHandle) const;
-
// The surfaces and other layers
LLSurface* mLandp;
@@ -387,11 +384,8 @@ private:
// Regions can have order 10,000 objects, so assume
// a structure of size 2^14 = 16,000
BOOL mCacheLoaded;
- typedef std::map<U32, LLVOCacheEntry *> cache_map_t;
- cache_map_t mCacheMap;
- LLVOCacheEntry mCacheStart;
- LLVOCacheEntry mCacheEnd;
- U32 mCacheEntriesCount;
+ BOOL mCacheDirty;
+ LLVOCacheEntry::vocache_entry_map_t mCacheMap;
LLDynamicArray<U32> mCacheMissFull;
LLDynamicArray<U32> mCacheMissCRC;
// time?