diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-03-19 11:52:32 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-03-19 11:52:32 -0700 |
| commit | 2a75b7b5909ed868b068c547eabd673d149eb2d9 (patch) | |
| tree | 71072259b6777669c476dc444c62dfb03ebc00bb /indra/newview/llviewerobject.cpp | |
| parent | 40e04fdb3b416a686c66989ee5d44c5eaf97b9fd (diff) | |
| parent | 7056e917f295f0dff5a919acae6f6ebedb6a91a5 (diff) | |
Merge with tip (another one)
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(); |