Merge remote-tracking branch 'thickbrick/exp' into exp

2 files changed, 10 insertions, 4 deletions

diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index a70169c..429b9d4 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -805,8 +805,8 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
                 }
 
                 const LLTextureEntry* tep = object->getTE(mPick.mObjectFace);
-                viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(tep->getID());
-                if (tep && media_impl.notNull() && media_impl->hasMedia())
+                viewer_media_t media_impl = tep ? LLViewerMedia::getMediaImplFromTextureID(tep->getID()) : NULL;
+                if (media_impl.notNull() && media_impl->hasMedia())
                 {
                         LL_DEBUGS("DoubleClicks") << "Double clicked running parcel media" << LL_ENDL;
                         return FALSE;
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index e622a7f..576f312 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -4013,9 +4013,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 && 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();