fix for SH-4656: crash at LLVOCacheEntry::updateParentBoundingInfo() line 510

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp
index 88f3c7d6f9..12a1e98075 100644
--- a/indra/newview/llvieweroctree.cpp
+++ b/indra/newview/llvieweroctree.cpp
@@ -330,6 +330,8 @@ LLViewerOctreeEntryData::LLViewerOctreeEntryData(LLViewerOctreeEntry::eEntryData
 //virtual
 void LLViewerOctreeEntryData::setOctreeEntry(LLViewerOctreeEntry* entry)
 {
+	llassert_always(mEntry.isNull());
+
 	if(mEntry.notNull())
 	{
 		return; 
@@ -346,6 +348,15 @@ void LLViewerOctreeEntryData::setOctreeEntry(LLViewerOctreeEntry* entry)
 	mEntry->addData(this);
 }
 
+void LLViewerOctreeEntryData::removeOctreeEntry()
+{
+	if(mEntry)
+	{
+		mEntry->removeData(this);
+		mEntry = NULL;
+	}
+}
+
 void LLViewerOctreeEntryData::setSpatialExtents(const LLVector3& min, const LLVector3& max)
 { 
 	mEntry->mExtents[0].load3(min.mV);