summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2014-02-06 10:15:00 -0700
committerXiaohong Bao <bao@lindenlab.com>2014-02-06 10:15:00 -0700
commitb5389618f3744464760bbe1a54b49750d211a1ac (patch)
treec80c64442176611b8ba10534421e248803459e85
parenta847caade4e112906f86cfbd8511d3414d9546db (diff)
more fix for a memory crash caused by accessing deleted pointers.
-rwxr-xr-xindra/newview/llvocache.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
index 26f6987916..2176ec9c9c 100755
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -589,14 +589,10 @@ void LLVOCacheEntry::updateParentBoundingInfo(const LLVOCacheEntry* child)
//-------------------------------------------------------------------
LLVOCacheGroup::~LLVOCacheGroup()
{
- //for(S32 i = 0; i < LLViewerCamera::NUM_CAMERAS; i++)
- //{
- // if(mOcclusionState[i] & ACTIVE_OCCLUSION)
- // {
- // ((LLVOCachePartition*)mSpatialPartition)->removeOccluder(this);
- // break;
- // }
- //}
+ if(mOcclusionState[LLViewerCamera::CAMERA_WORLD] & ACTIVE_OCCLUSION)
+ {
+ ((LLVOCachePartition*)mSpatialPartition)->removeOccluder(this);
+ }
}
//virtual