summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-01-28 00:32:33 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-01-28 00:32:33 +0200
commitaf830e5fc5840194be95140f644a27011b9b7e06 (patch)
tree726f650f614e37024262e268841a8164fc7bf823 /indra
parent12f21640c63af26c32965e3546668bbf1ee32389 (diff)
SL-16721 Crash at LLVOAvatar::idleUpdateMisc
bridge in state 24 (dead)
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvoavatar.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 56a895bd1f..2d34e28b93 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2825,7 +2825,7 @@ void LLVOAvatar::idleUpdateMisc(bool detailed_update)
//override rigged attachments' octree spatial extents with this avatar's bounding box
LLSpatialBridge* bridge = attached_object->mDrawable->getSpatialBridge();
bool rigged = false;
- if (bridge)
+ if (bridge && !bridge->isDead())
{
//transform avatar bounding box into attachment's coordinate frame
LLVector4a extents[2];
@@ -2842,7 +2842,7 @@ void LLVOAvatar::idleUpdateMisc(bool detailed_update)
attached_object->mDrawable->makeActive();
attached_object->mDrawable->updateXform(TRUE);
- if (bridge)
+ if (bridge && !bridge->isDead())
{
if (!rigged)
{