diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-22 12:46:00 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-22 12:46:00 +0200 |
| commit | 8e50d02e1b9c2a051009df9f8ecf058e1cdb325d (patch) | |
| tree | 643669b40d6e72b8bdd4b8a5dffb44dc9e460362 /indra/newview/llviewerobject.cpp | |
| parent | 92f33c185efe196d9d15989e2dc833f8d6013159 (diff) | |
| parent | 6e4f9b9073f735dd169f09f35811d14736b4cd0c (diff) | |
merge
--HG--
branch : product-engine
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(); |