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

SL-10320 FIXED Crash in LLVOAvatar::updateAttachmentOverrides()

meow-7.2.2
maxim_productengine 2019-01-08 14:15:44 +02:00
parent 378ed29a38
commit db5dbaafc4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llvoavatar.cpp
View File

@ -6731,7 +6731,7 @@ void LLVOAvatar::rebuildAttachmentOverrides()
LLViewerObject *vo = *at_it;
// Attached animated objects affect joints in their control
// avs, not the avs to which they are attached.
if (!vo->isAnimatedObject())
if (vo && !vo->isAnimatedObject())
{
addAttachmentOverridesForObject(vo);
}
@ -6782,7 +6782,7 @@ void LLVOAvatar::updateAttachmentOverrides()
LLViewerObject *vo = *at_it;
// Attached animated objects affect joints in their control
// avs, not the avs to which they are attached.
if (!vo->isAnimatedObject())
if (vo && !vo->isAnimatedObject())
{
addAttachmentOverridesForObject(vo, &meshes_seen);
}