diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-10-07 22:49:00 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-10-07 22:49:00 +0000 |
| commit | 4296542cd062af425d7744c88d6dd2bd00daf532 (patch) | |
| tree | 8926d4f0bfaa9ed672f4cf90577afcf8e7f44a97 /indra/newview/llselectmgr.cpp | |
| parent | c9be97fdfcc6a4c6b23a8c90916af54a38d60ab0 (diff) | |
Roll back of r98854 Accidentally commited merge in progress
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 76271a65bb..87bf1c212d 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -3450,9 +3450,7 @@ void LLSelectMgr::deselectAllIfTooFar() } LLVector3d selectionCenter = getSelectionCenterGlobal(); - if (gSavedSettings.getBOOL("LimitSelectDistance") - && (!mSelectedObjects->getPrimaryObject() || !mSelectedObjects->getPrimaryObject()->isAvatar()) - && !mSelectedObjects->isAttachment() + if (gSavedSettings.getBOOL("LimitSelectDistance") && !selectionCenter.isExactlyZero()) { F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance"); |