summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gavriliuk <alexandrgproductengine@lindenlab.com>2024-08-09 16:41:37 +0200
committerGuru <alexandrgproductengine@lindenlab.com>2024-08-09 18:17:52 +0200
commitecfa05711ecf5e331c6b5eb6e404ecf940ad014e (patch)
tree0cb8da357da341ce6e2f349419ae123a29a106f6
parent5a1ce7974b0c58d32c047a814fa94d4072a70de7 (diff)
#2231 BugSplat Crash #1502347: SecondLifeViewer!LLViewerObject::getBoundingBoxAgent(5858)
-rw-r--r--indra/newview/llviewerobject.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index fd85d75d98..a2abd1d930 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -5753,7 +5753,8 @@ LLBBox LLViewerObject::getBoundingBoxAgent() const
}
if (avatar_parent && avatar_parent->isAvatar() &&
- root_edit && root_edit->mDrawable.notNull() && root_edit->mDrawable->getXform()->getParent())
+ root_edit && root_edit->mDrawable.notNull() && !root_edit->mDrawable->isDead() &&
+ root_edit->mDrawable->getXform()->getParent())
{
LLXform* parent_xform = root_edit->mDrawable->getXform()->getParent();
position_agent = (getPositionEdit() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition();