diff options
| author | McCabe Maxsted | 2011-06-08 10:39:05 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2011-06-09 23:12:15 -0500 |
| commit | fa16190ea2feb752c365599b14cd4bd6ba585853 (patch) | |
| tree | a9ba633ecd1d003925510491e489199b156b1475 /linden/indra/newview/llselectmgr.cpp | |
| parent | Removed debug setting MaxSelectDistance... (diff) | |
| download | meta-impy-fa16190ea2feb752c365599b14cd4bd6ba585853.zip meta-impy-fa16190ea2feb752c365599b14cd4bd6ba585853.tar.gz meta-impy-fa16190ea2feb752c365599b14cd4bd6ba585853.tar.bz2 meta-impy-fa16190ea2feb752c365599b14cd4bd6ba585853.tar.xz | |
Don't limit select distance when Disable Max Build Constraints is enabled
(cherry picked from commit c5ce8f27de70b81232aa8995dda80186eebe0247)
Diffstat (limited to 'linden/indra/newview/llselectmgr.cpp')
| -rw-r--r-- | linden/indra/newview/llselectmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp index ba73324..4a6c8ed 100644 --- a/linden/indra/newview/llselectmgr.cpp +++ b/linden/indra/newview/llselectmgr.cpp | |||
| @@ -3496,7 +3496,7 @@ void LLSelectMgr::deselectAllIfTooFar() | |||
| 3496 | // if (gSavedSettings.getBOOL("LimitSelectDistance") | 3496 | // if (gSavedSettings.getBOOL("LimitSelectDistance") |
| 3497 | // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f | 3497 | // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f |
| 3498 | BOOL fRlvFartouch = gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH) && gFloaterTools->getVisible(); | 3498 | BOOL fRlvFartouch = gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH) && gFloaterTools->getVisible(); |
| 3499 | if ( (gSavedSettings.getBOOL("LimitSelectDistance") || (fRlvFartouch) ) | 3499 | if ( ((!gSavedSettings.getBOOL("DisableMaxBuildConstraints") && gSavedSettings.getBOOL("LimitSelectDistance")) || (fRlvFartouch) ) |
| 3500 | // [/RLVa:KB] | 3500 | // [/RLVa:KB] |
| 3501 | && (!mSelectedObjects->getPrimaryObject() || !mSelectedObjects->getPrimaryObject()->isAvatar()) | 3501 | && (!mSelectedObjects->getPrimaryObject() || !mSelectedObjects->getPrimaryObject()->isAvatar()) |
| 3502 | && !mSelectedObjects->isAttachment() | 3502 | && !mSelectedObjects->isAttachment() |