diff options
Diffstat (limited to 'linden/indra/newview/llselectmgr.cpp')
-rw-r--r-- | linden/indra/newview/llselectmgr.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp index f46f104..af97e2e 100644 --- a/linden/indra/newview/llselectmgr.cpp +++ b/linden/indra/newview/llselectmgr.cpp | |||
@@ -3451,12 +3451,20 @@ void LLSelectMgr::deselectAllIfTooFar() | |||
3451 | } | 3451 | } |
3452 | 3452 | ||
3453 | LLVector3d selectionCenter = getSelectionCenterGlobal(); | 3453 | LLVector3d selectionCenter = getSelectionCenterGlobal(); |
3454 | if (gSavedSettings.getBOOL("LimitSelectDistance") | 3454 | |
3455 | // if (gSavedSettings.getBOOL("LimitSelectDistance") | ||
3456 | // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f | ||
3457 | BOOL fRlvFartouch = gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH) && gFloaterTools->getVisible(); | ||
3458 | if ( (gSavedSettings.getBOOL("LimitSelectDistance") || (fRlvFartouch) ) | ||
3459 | // [/RLVa:KB] | ||
3455 | && (!mSelectedObjects->getPrimaryObject() || !mSelectedObjects->getPrimaryObject()->isAvatar()) | 3460 | && (!mSelectedObjects->getPrimaryObject() || !mSelectedObjects->getPrimaryObject()->isAvatar()) |
3456 | && !mSelectedObjects->isAttachment() | 3461 | && !mSelectedObjects->isAttachment() |
3457 | && !selectionCenter.isExactlyZero()) | 3462 | && !selectionCenter.isExactlyZero()) |
3458 | { | 3463 | { |
3459 | F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance"); | 3464 | // F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance"); |
3465 | // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f | ||
3466 | F32 deselect_dist = (!fRlvFartouch) ? gSavedSettings.getF32("MaxSelectDistance") : 1.5f; | ||
3467 | // [/RLVa:KB] | ||
3460 | F32 deselect_dist_sq = deselect_dist * deselect_dist; | 3468 | F32 deselect_dist_sq = deselect_dist * deselect_dist; |
3461 | 3469 | ||
3462 | LLVector3d select_delta = gAgent.getPositionGlobal() - selectionCenter; | 3470 | LLVector3d select_delta = gAgent.getPositionGlobal() - selectionCenter; |