diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-19 14:36:26 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-19 14:36:26 -0400 |
| commit | 08d210c7e9db8688f41619dd370500d2fd22b40d (patch) | |
| tree | 524c81f82fc75c19985a82807b9f82cf6e6d1c5b /indra/newview/llviewerobject.cpp | |
| parent | 7ba5c0582fc56f7a394b711eb19477b2476547ab (diff) | |
| parent | 7056e917f295f0dff5a919acae6f6ebedb6a91a5 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index b5642d07a5..6c8346df86 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4029,7 +4029,8 @@ LLBBox LLViewerObject::getBoundingBoxAgent() const avatar_parent = (LLViewerObject*)root_edit->getParent(); } - if (avatar_parent && avatar_parent->isAvatar() && root_edit && root_edit->mDrawable.notNull()) + if (avatar_parent && avatar_parent->isAvatar() && + root_edit && root_edit->mDrawable.notNull() && root_edit->mDrawable->getXform()->getParent()) { LLXform* parent_xform = root_edit->mDrawable->getXform()->getParent(); position_agent = (getPositionEdit() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition(); |