diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-01-13 11:30:56 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-01-13 11:30:56 -0800 |
| commit | ce55885aa3a95b0e83990d46ff8bd3214ece4faa (patch) | |
| tree | dec8aca255159dc6af17f25d87e03a1344e2c666 /indra/newview/llviewerregion.h | |
| parent | a4e775e54cd1ae3f5be80e73eef6b629384a00c5 (diff) | |
| parent | 756a4e26da6cec82d48a71d05b1f43623b56313d (diff) | |
Pull sync to viewer-development
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rw-r--r-- | indra/newview/llviewerregion.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 3d3f1d62a6..7c6559203e 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -51,7 +51,7 @@ // Surface id's #define LAND 1 #define WATER 2 -const U32 MAX_OBJECT_CACHE_ENTRIES = 10000; +const U32 MAX_OBJECT_CACHE_ENTRIES = 50000; class LLEventPoll; @@ -275,9 +275,24 @@ public: void getInfo(LLSD& info); + typedef enum + { + CACHE_MISS_TYPE_FULL = 0, + CACHE_MISS_TYPE_CRC, + CACHE_MISS_TYPE_NONE + } eCacheMissType; + + typedef enum + { + CACHE_UPDATE_DUPE = 0, + CACHE_UPDATE_CHANGED, + CACHE_UPDATE_ADDED, + CACHE_UPDATE_REPLACED + } eCacheUpdateResult; + // handle a full update message - void cacheFullUpdate(LLViewerObject* objectp, LLDataPackerBinaryBuffer &dp); - LLDataPacker *getDP(U32 local_id, U32 crc); + eCacheUpdateResult cacheFullUpdate(LLViewerObject* objectp, LLDataPackerBinaryBuffer &dp); + LLDataPacker *getDP(U32 local_id, U32 crc, U8 &cache_miss_type); void requestCacheMisses(); void addCacheMissFull(const U32 local_id); |