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

SL-11597 Fix crash on dead object

meow-7.2.2
andreykproductengine 2019-07-16 18:31:58 +03:00
parent 417a2d43f3
commit aa1dd6bb7b
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llvoavatar.cpp
View File

@ -8245,16 +8245,19 @@ void LLVOAvatar::updateMeshTextures()
++attachment_iter)
{
LLViewerObject* attached_object = (*attachment_iter);
attached_object->refreshBakeTexture();
LLViewerObject::const_child_list_t& child_list = attached_object->getChildren();
for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
iter != child_list.end(); ++iter)
if (attached_object && !attached_object->isDead())
{
LLViewerObject* objectp = *iter;
if (objectp)
attached_object->refreshBakeTexture();
LLViewerObject::const_child_list_t& child_list = attached_object->getChildren();
for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
iter != child_list.end(); ++iter)
{
objectp->refreshBakeTexture();
LLViewerObject* objectp = *iter;
if (objectp && !objectp->isDead())
{
objectp->refreshBakeTexture();
}
}
}
}