summaryrefslogtreecommitdiff
path: root/indra/newview/llvocache.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2014-01-09 21:17:49 -0700
committerXiaohong Bao <bao@lindenlab.com>2014-01-09 21:17:49 -0700
commit87f852ee67c75ac415ce716157bdd9ba94c60441 (patch)
tree40fbf929b51d056790e52e463f8e5bdbfca53856 /indra/newview/llvocache.cpp
parent6a113325521fa68c634cd900de8352c35fe91268 (diff)
fix for SH-4659:crash at LLOcclusionCullingGroup::doOcclusion line 1150
Diffstat (limited to 'indra/newview/llvocache.cpp')
-rwxr-xr-xindra/newview/llvocache.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
index aa3594638a..8af6d74ad7 100755
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -609,11 +609,18 @@ LLVOCachePartition::LLVOCachePartition(LLViewerRegion* regionp)
new LLVOCacheGroup(mOctree, this);
}
-void LLVOCachePartition::addEntry(LLViewerOctreeEntry* entry)
+bool LLVOCachePartition::addEntry(LLViewerOctreeEntry* entry)
{
llassert(entry->hasVOCacheEntry());
+ if(!llfinite(entry->getBinRadius()) || !entry->getPositionGroup().isFinite3())
+ {
+ return false; //data corrupted
+ }
+
mOctree->insert(entry);
+
+ return true;
}
void LLVOCachePartition::removeEntry(LLViewerOctreeEntry* entry)