1 files changed, 4 insertions, 2 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index ebfdd39..2e4983c 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -1102,7 +1102,7 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
                 switch (mSelectedObjects->mSelectType)
                 {
                 case SELECT_TYPE_ATTACHMENT:
-                        if (first_object)
+                        if (first_object && first_object->getRootEdit()->mDrawable.notNull())
                         {
                                 // this means this object *has* to be an attachment
                                 LLXform* attachment_point_xform = first_object->getRootEdit()->mDrawable->mXform.getParent();
@@ -3450,7 +3450,9 @@ void LLSelectMgr::deselectAllIfTooFar()
         }
 
         LLVector3d selectionCenter = getSelectionCenterGlobal();
-        if (gSavedSettings.getBOOL("LimitSelectDistance") 
+        if (gSavedSettings.getBOOL("LimitSelectDistance")
+                && (!mSelectedObjects->getPrimaryObject() || !mSelectedObjects->getPrimaryObject()->isAvatar())
+                && !mSelectedObjects->isAttachment()
                 && !selectionCenter.isExactlyZero())
         {
                 F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance");