diff options
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/llglsandbox.cpp | 2 | ||||
-rw-r--r-- | linden/indra/newview/llmaniprotate.cpp | 2 | ||||
-rw-r--r-- | linden/indra/newview/llmanipscale.cpp | 2 | ||||
-rw-r--r-- | linden/indra/newview/llmaniptranslate.cpp | 2 | ||||
-rw-r--r-- | linden/indra/newview/llselectmgr.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp index 89f9ffa..61d0994 100644 --- a/linden/indra/newview/llglsandbox.cpp +++ b/linden/indra/newview/llglsandbox.cpp | |||
@@ -230,7 +230,7 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask) | |||
230 | glMatrixMode(GL_PROJECTION); | 230 | glMatrixMode(GL_PROJECTION); |
231 | gGL.pushMatrix(); | 231 | gGL.pushMatrix(); |
232 | 232 | ||
233 | BOOL limit_select_distance = gSavedSettings.getBOOL("LimitSelectDistance"); | 233 | BOOL limit_select_distance = (!gSavedSettings.getBOOL("DisableMaxBuildConstraints") && gSavedSettings.getBOOL("LimitSelectDistance")); |
234 | if (limit_select_distance) | 234 | if (limit_select_distance) |
235 | { | 235 | { |
236 | // ...select distance from control | 236 | // ...select distance from control |
diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp index b094328..77c8bd5 100644 --- a/linden/indra/newview/llmaniprotate.cpp +++ b/linden/indra/newview/llmaniprotate.cpp | |||
@@ -1126,7 +1126,7 @@ BOOL LLManipRotate::updateVisiblity() | |||
1126 | F32 z_dist = -1.f * (mCenterToCam * cameraAtAxis); | 1126 | F32 z_dist = -1.f * (mCenterToCam * cameraAtAxis); |
1127 | 1127 | ||
1128 | // Don't drag manip if object too far away | 1128 | // Don't drag manip if object too far away |
1129 | if (gSavedSettings.getBOOL("LimitSelectDistance")) | 1129 | if (!gSavedSettings.getBOOL("DisableMaxBuildConstraints") && gSavedSettings.getBOOL("LimitSelectDistance")) |
1130 | { | 1130 | { |
1131 | F32 max_select_distance = gHippoLimits->getMaxSelectDistance(); | 1131 | F32 max_select_distance = gHippoLimits->getMaxSelectDistance(); |
1132 | if (dist_vec(gAgent.getPositionAgent(), center) > max_select_distance) | 1132 | if (dist_vec(gAgent.getPositionAgent(), center) > max_select_distance) |
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp index 32709fd..33ee1b9 100644 --- a/linden/indra/newview/llmanipscale.cpp +++ b/linden/indra/newview/llmanipscale.cpp | |||
@@ -236,7 +236,7 @@ void LLManipScale::render() | |||
236 | range_from_agent = dist_vec(gAgent.getPositionAgent(), center_agent); | 236 | range_from_agent = dist_vec(gAgent.getPositionAgent(), center_agent); |
237 | 237 | ||
238 | // Don't draw manip if object too far away | 238 | // Don't draw manip if object too far away |
239 | if (gSavedSettings.getBOOL("LimitSelectDistance")) | 239 | if (!gSavedSettings.getBOOL("DisableMaxBuildConstraints") && gSavedSettings.getBOOL("LimitSelectDistance")) |
240 | { | 240 | { |
241 | F32 max_select_distance = gHippoLimits->getMaxSelectDistance(); | 241 | F32 max_select_distance = gHippoLimits->getMaxSelectDistance(); |
242 | if (range_from_agent > max_select_distance) | 242 | if (range_from_agent > max_select_distance) |
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp index c113446..53578ca 100644 --- a/linden/indra/newview/llmaniptranslate.cpp +++ b/linden/indra/newview/llmaniptranslate.cpp | |||
@@ -1821,7 +1821,7 @@ void LLManipTranslate::renderTranslationHandles() | |||
1821 | F32 range_from_agent = dist_vec(gAgent.getPositionAgent(), selection_center); | 1821 | F32 range_from_agent = dist_vec(gAgent.getPositionAgent(), selection_center); |
1822 | 1822 | ||
1823 | // Don't draw handles if you're too far away | 1823 | // Don't draw handles if you're too far away |
1824 | if (gSavedSettings.getBOOL("LimitSelectDistance")) | 1824 | if (!gSavedSettings.getBOOL("DisableMaxBuildConstraints") && gSavedSettings.getBOOL("LimitSelectDistance")) |
1825 | { | 1825 | { |
1826 | if (range_from_agent > gHippoLimits->getMaxSelectDistance()) | 1826 | if (range_from_agent > gHippoLimits->getMaxSelectDistance()) |
1827 | { | 1827 | { |
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() |