diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-09 09:50:29 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-09 09:50:29 -0800 |
| commit | cf09a48bb21d553c837186cc2e7198801f06691a (patch) | |
| tree | a668e28da71f9fafe6333784400dc8f24671fad6 /indra/newview/llviewerobject.cpp | |
| parent | 1c1ebd0365a115c736f62fadec37e006cbf43f44 (diff) | |
| parent | 8fdb199707979916d4d3c23cd19fec9fed411aba (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-mediaclasses
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 886f1d9ef5..d0afa9d9de 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4019,9 +4019,14 @@ LLBBox LLViewerObject::getBoundingBoxAgent() const { LLVector3 position_agent; LLQuaternion rot; + LLViewerObject* avatar_parent = NULL; LLViewerObject* root_edit = (LLViewerObject*)getRootEdit(); - LLViewerObject* avatar_parent = (LLViewerObject*)root_edit->getParent(); - if (avatar_parent && avatar_parent->isAvatar() && root_edit->mDrawable.notNull()) + if (root_edit) + { + avatar_parent = (LLViewerObject*)root_edit->getParent(); + } + + if (avatar_parent && avatar_parent->isAvatar() && root_edit && root_edit->mDrawable.notNull()) { LLXform* parent_xform = root_edit->mDrawable->getXform()->getParent(); position_agent = (getPositionEdit() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition(); |