diff options
| author | Richard Nelson <none@none> | 2010-03-19 14:22:40 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-03-19 14:22:40 -0700 |
| commit | 8992f058e077a78d091c864619d9d740dc305094 (patch) | |
| tree | 7d77fbc4451a4eb8b211292a44b8003cb51fdf01 /indra/newview/llviewerobject.cpp | |
| parent | fd096e5011c8d777f54c7fe473b12e6730dbedc0 (diff) | |
| parent | f50be64167c254e27f635ad47d8940551f0c6ab4 (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(); |