diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-11-21 11:20:45 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-11-21 11:20:45 -0700 |
| commit | c14ecc817895d06b04a803a88d00d4ae1c80060a (patch) | |
| tree | d360b01bb2ff7065bc2d7608d094bce960e7f16a /indra/newview/llviewerregion.h | |
| parent | 5979467198e9a8d4c065de908cf48c7d73101cd7 (diff) | |
fix for SH-4629: Interesting: crash at LLViewerRegion::killObject
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rwxr-xr-x | indra/newview/llviewerregion.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index a789cc6715..0f27def8a5 100755 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -235,7 +235,7 @@ public: void addVisibleCacheEntry(LLVOCacheEntry* entry); void addActiveCacheEntry(LLVOCacheEntry* entry); void removeActiveCacheEntry(LLVOCacheEntry* entry, LLDrawable* drawablep); - void killCacheEntry(U32 local_id); //physically delete the cache entry + void killCacheEntry(U32 local_id, bool kill_obj = true); //physically delete the cache entry // Like idleUpdate, but forces everything to complete regardless of // how long it takes. @@ -385,7 +385,7 @@ private: 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); //physically delete the cache entry + void killCacheEntry(LLVOCacheEntry* entry, bool kill_obj = true); //physically delete the cache entry void killInvisibleObjects(F32 max_time); void createVisibleObjects(F32 max_time); void updateVisibleEntries(F32 max_time); //update visible entries |