fix for SH-4398: Interesting: viewer crash in LLVOCacheEntry::updateParentBoundingInfo

1 files changed, 13 insertions, 2 deletions

diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 47e59d3c00..49bb05d88e 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -866,8 +866,19 @@ void LLViewerRegion::killCacheEntry(LLVOCacheEntry* entry)
 	//remove from the forced visible list
 	mImpl->mVisibleEntries.erase(entry);
 
-	//kill LLViewerObject if exists
-	//this should be done by the rendering pipeline automatically.
+	//disconnect from parent if it is a child
+	if(entry->getParentID() > 0)
+	{
+		LLVOCacheEntry* parent = getCacheEntry(entry->getParentID());
+		if(parent)
+		{
+			parent->removeChild(entry);
+		}
+	}
+	else if(entry->getNumOfChildren() > 0)//disconnect children if has any
+	{
+		entry->removeAllChildren();
+	}
 	
 	entry->setState(LLVOCacheEntry::INACTIVE);