livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for SH-4298: Interesting: Viewer crash in LLViewerOctreeCull and 

SH-4341: Interesting: Viewer crash in LLViewerOctreeCull
meow-7.2.2
Xiaohong Bao 2013-07-25 16:53:01 -06:00
parent 073a207ab9
commit 83a628a431
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llvieweroctree.cpp
View File

@ -464,15 +464,16 @@ bool LLviewerOctreeGroup::removeFromGroup(LLViewerOctreeEntry* entry)
llassert(!entry->getGroup());
unbound();
setState(OBJECT_DIRTY);
if (mOctreeNode)
{
if (!mOctreeNode->remove(entry))
if (!mOctreeNode->remove(entry)) //this could cause *this* pointer to be destroyed, so no more function calls after this.
{
OCT_ERRS << "Could not remove LLVOCacheEntry from LLVOCacheOctreeGroup" << llendl;
return false;
}
}
setState(OBJECT_DIRTY);
}
return true;
}
@ -580,9 +581,10 @@ void LLviewerOctreeGroup::handleInsertion(const TreeNode* node, LLViewerOctreeEn
//virtual
void LLviewerOctreeGroup::handleRemoval(const TreeNode* node, LLViewerOctreeEntry* obj)
{
obj->setGroup(NULL);
unbound();
setState(OBJECT_DIRTY);
obj->setGroup(NULL); //this could cause *this* pointer to be destroyed. So no more function calls after this.
}
//virtual