diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-03-07 19:39:13 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-03-07 19:39:13 +0200 |
| commit | fe2f9aed2543615cb6d314ab01b76f0eba9d6ccc (patch) | |
| tree | af46ca32f1a0db365bb0a5f49cf1bfdd872e6df3 | |
| parent | c012e872a269b19022e58b861434441ce52853bf (diff) | |
SL-16721 Crash on idleUpdateMisc #2
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 31035f666d..5ee661f6c0 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2817,11 +2817,15 @@ void LLVOAvatar::idleUpdateMisc(bool detailed_update) ++attachment_iter) { LLViewerObject* attached_object = attachment_iter->get(); - BOOL visibleAttachment = visible || (attached_object && + BOOL visibleAttachment = visible || (attached_object && attached_object->mDrawable.notNull() && !(attached_object->mDrawable->getSpatialBridge() && attached_object->mDrawable->getSpatialBridge()->getRadius() < 2.0)); - if (visibleAttachment && attached_object && !attached_object->isDead() && attachment->getValid()) + if (visibleAttachment + && attached_object + && !attached_object->isDead() + && attachment->getValid() + && attached_object->mDrawable.notNull()) { //override rigged attachments' octree spatial extents with this avatar's bounding box |