diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-01-08 14:15:44 +0200 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-01-08 14:15:44 +0200 |
| commit | 2461a7fe396fe95a043ed1cfc3b0c251d242a2c3 (patch) | |
| tree | cdf59a808c6d92b1756bdeef4436f9729b58dcc3 /indra/newview | |
| parent | 09b750483a2cde7ea3c80a0238f3224a2cf1cb70 (diff) | |
SL-10320 FIXED Crash in LLVOAvatar::updateAttachmentOverrides()
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 321f774210..2682c5b698 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5992,7 +5992,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); } @@ -6043,7 +6043,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); } |