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 8064245..83abcf4 100644 --- a/linden/indra/newview/llselectmgr.cpp +++ b/linden/indra/newview/llselectmgr.cpp | |||
@@ -3439,12 +3439,20 @@ void LLSelectMgr::deselectAllIfTooFar() | |||
3439 | } | 3439 | } |
3440 | 3440 | ||
3441 | LLVector3d selectionCenter = getSelectionCenterGlobal(); | 3441 | LLVector3d selectionCenter = getSelectionCenterGlobal(); |
3442 | if (gSavedSettings.getBOOL("LimitSelectDistance") | 3442 | |
3443 | // if (gSavedSettings.getBOOL("LimitSelectDistance") | ||
3444 | // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f | ||
3445 | BOOL fRlvFartouch = gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH) && gFloaterTools->getVisible(); | ||
3446 | if ( (gSavedSettings.getBOOL("LimitSelectDistance") || (fRlvFartouch) ) | ||
3447 | // [/RLVa:KB] | ||
3443 | && (!mSelectedObjects->getPrimaryObject() || !mSelectedObjects->getPrimaryObject()->isAvatar()) | 3448 | && (!mSelectedObjects->getPrimaryObject() || !mSelectedObjects->getPrimaryObject()->isAvatar()) |
3444 | && !mSelectedObjects->isAttachment() | 3449 | && !mSelectedObjects->isAttachment() |
3445 | && !selectionCenter.isExactlyZero()) | 3450 | && !selectionCenter.isExactlyZero()) |
3446 | { | 3451 | { |
3447 | F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance"); | 3452 | // F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance"); |
3453 | // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f | ||
3454 | F32 deselect_dist = (!fRlvFartouch) ? gSavedSettings.getF32("MaxSelectDistance") : 1.5f; | ||
3455 | // [/RLVa:KB] | ||
3448 | F32 deselect_dist_sq = deselect_dist * deselect_dist; | 3456 | F32 deselect_dist_sq = deselect_dist * deselect_dist; |
3449 | 3457 | ||
3450 | LLVector3d select_delta = gAgent.getPositionGlobal() - selectionCenter; | 3458 | LLVector3d select_delta = gAgent.getPositionGlobal() - selectionCenter; |