summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2012-11-08 21:36:47 -0700
committerXiaohong Bao <bao@lindenlab.com>2012-11-08 21:36:47 -0700
commitc2859e4663c405950b6f433270ae558852330c76 (patch)
tree2cd7873a89bbb1e4772ab9a92324b1e86814cb49 /indra/newview/llviewerregion.h
parent8e6341b9194b1fb27d92d8f5e6739390ac882941 (diff)
for SH-3472: prioritize object loading
Diffstat (limited to 'indra/newview/llviewerregion.h')
-rw-r--r--indra/newview/llviewerregion.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 86d3ee0d8c..9a47227f1c 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -317,7 +317,7 @@ public:
// handle a full update message
eCacheUpdateResult cacheFullUpdate(LLViewerObject* objectp, LLDataPackerBinaryBuffer &dp);
LLVOCacheEntry* getCacheEntryForOctree(U32 local_id);
- LLDataPacker *getDP(U32 local_id, U32 crc, U8 &cache_miss_type);
+ bool probeCache(U32 local_id, U32 crc, U8 &cache_miss_type);
void requestCacheMisses();
void addCacheMissFull(const U32 local_id);
@@ -354,8 +354,8 @@ private:
void killCacheEntry(LLVOCacheEntry* entry); //physically delete the cache entry
F32 killInvisibleObjects(F32 max_time);
- F32 addLinkedSetChildren(F32 max_time, S32& max_num_objects);
- F32 addVisibleObjects(F32 max_time, S32& max_num_objects);
+ F32 createVisibleObjects(F32 max_time);
+ F32 updateVisibleEntries(F32 max_time); //update visible entries
public:
struct CompareDistance