1 files changed, 8 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 65c1d11..9d69be5 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -4012,9 +4012,15 @@ 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() && root_edit->mDrawable->getXform()->getParent())
         {
                 LLXform* parent_xform = root_edit->mDrawable->getXform()->getParent();
                 position_agent = (getPositionEdit() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition();