1 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 78b921b..2e4983c 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -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");