diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2014-01-06 12:28:36 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2014-01-06 12:28:36 -0700 |
| commit | 10ae6a779e6726da24acb0ae60bb8f430daf9bdb (patch) | |
| tree | bda93984536c2c85eb95b6501b6135116cf3c3b1 /indra/newview/llviewerregion.h | |
| parent | 5e55cfd49e591ca6c07b37d8eee80eb71011e57b (diff) | |
fix for SH-4656: crash at LLVOCacheEntry::updateParentBoundingInfo() line 510
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rwxr-xr-x | indra/newview/llviewerregion.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 2085f83f32..7ce191fe8f 100755 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -331,7 +331,7 @@ public: eCacheUpdateResult cacheFullUpdate(LLDataPackerBinaryBuffer &dp, U32 flags); eCacheUpdateResult cacheFullUpdate(LLViewerObject* objectp, LLDataPackerBinaryBuffer &dp, U32 flags); LLVOCacheEntry* getCacheEntryForOctree(U32 local_id); - LLVOCacheEntry* getCacheEntry(U32 local_id); + LLVOCacheEntry* getCacheEntry(U32 local_id, bool valid = true); bool probeCache(U32 local_id, U32 crc, U32 flags, U8 &cache_miss_type); void requestCacheMisses(); void addCacheMissFull(const U32 local_id); @@ -384,7 +384,6 @@ private: LLViewerObject* addNewObject(LLVOCacheEntry* entry); void killObject(LLVOCacheEntry* entry, std::vector<LLDrawable*>& delete_list); void removeFromVOCacheTree(LLVOCacheEntry* entry); - void replaceVisibleCacheEntry(LLVOCacheEntry* old_entry, LLVOCacheEntry* new_entry); void killCacheEntry(LLVOCacheEntry* entry, bool for_rendering = false); //physically delete the cache entry void killInvisibleObjects(F32 max_time); void createVisibleObjects(F32 max_time); |