diff options
| author | James Cook <james@lindenlab.com> | 2010-03-29 16:55:22 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-29 16:55:22 -0700 |
| commit | ecc2c726502448076295254714c0bfa8c0074f25 (patch) | |
| tree | 6a9434c540f7b5ea7bca326df1a420e4a0a99cc4 /indra/newview/llviewerobject.cpp | |
| parent | d2f9e34598621f1dabad15025417efd6b81dddf0 (diff) | |
| parent | ac103403160e87bb6b40ac3e032d077a3381da8e (diff) | |
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
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 daa48e7054..f6c9abd53d 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4030,7 +4030,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(); |