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

fix for SH-4637: Viewer-Interesting crashes if you teleport after crossing a region border.

meow-7.2.2
Xiaohong Bao 2013-11-26 17:44:54 -07:00
parent 04aece3282
commit d8e9286716
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llspatialpartition.cpp
View File

@ -840,9 +840,9 @@ void LLSpatialGroup::handleDestruction(const TreeNode* node)
{
return;
}
setState(DEAD);
for (element_iter i = getDataBegin(); getElementCount() > 0 && i != getDataEnd();)
setState(DEAD);
for (element_iter i = getDataBegin(); i != getDataEnd(); ++i)
{
LLViewerOctreeEntry* entry = *i;
@ -852,14 +852,6 @@ void LLSpatialGroup::handleDestruction(const TreeNode* node)
{
((LLDrawable*)entry->getDrawable())->setGroup(NULL);
}
else
{
LL_ERRS() << "No Drawable found in the entry." << LL_ENDL;
}
}
else
{
++i;
}
}

6
indra/newview/llvieweroctree.cpp
View File

@ -481,6 +481,12 @@ bool LLViewerOctreeGroup::removeFromGroup(LLViewerOctreeEntry* entry)
{
llassert(entry != NULL);
llassert(!entry->getGroup());
if(isDead()) //group is about to be destroyed, not need to double delete the entry.
{
entry->setBinIndex(-1);
return true;
}
unbound();
setState(OBJECT_DIRTY);