Don't limit select distance when Disable Max Build Constraints is enabled

(cherry picked from commit c5ce8f27de70b81232aa8995dda80186eebe0247)

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)
         glMatrixMode(GL_PROJECTION);
         gGL.pushMatrix();
 
-        BOOL limit_select_distance = gSavedSettings.getBOOL("LimitSelectDistance");
+        BOOL limit_select_distance = (!gSavedSettings.getBOOL("DisableMaxBuildConstraints") && gSavedSettings.getBOOL("LimitSelectDistance"));
         if (limit_select_distance)
         {
                 // ...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()
                         F32 z_dist = -1.f * (mCenterToCam * cameraAtAxis);
 
                         // Don't drag manip if object too far away
-                        if (gSavedSettings.getBOOL("LimitSelectDistance"))
+                        if (!gSavedSettings.getBOOL("DisableMaxBuildConstraints") && gSavedSettings.getBOOL("LimitSelectDistance"))
                         {
                                 F32 max_select_distance = gHippoLimits->getMaxSelectDistance();
                                 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()
                         range_from_agent = dist_vec(gAgent.getPositionAgent(), center_agent);
 
                         // Don't draw manip if object too far away
-                        if (gSavedSettings.getBOOL("LimitSelectDistance"))
+                        if (!gSavedSettings.getBOOL("DisableMaxBuildConstraints") && gSavedSettings.getBOOL("LimitSelectDistance"))
                         {
                                 F32 max_select_distance = gHippoLimits->getMaxSelectDistance();
                                 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()
                 F32 range_from_agent = dist_vec(gAgent.getPositionAgent(), selection_center);
                 
                 // Don't draw handles if you're too far away
-                if (gSavedSettings.getBOOL("LimitSelectDistance"))
+                if (!gSavedSettings.getBOOL("DisableMaxBuildConstraints") && gSavedSettings.getBOOL("LimitSelectDistance"))
                 {
                         if (range_from_agent > gHippoLimits->getMaxSelectDistance())
                         {
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()
 //      if (gSavedSettings.getBOOL("LimitSelectDistance")
 // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
         BOOL fRlvFartouch = gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH) && gFloaterTools->getVisible();
-        if ( (gSavedSettings.getBOOL("LimitSelectDistance") || (fRlvFartouch) )
+        if ( ((!gSavedSettings.getBOOL("DisableMaxBuildConstraints") && gSavedSettings.getBOOL("LimitSelectDistance")) || (fRlvFartouch) )
 // [/RLVa:KB]
                 && (!mSelectedObjects->getPrimaryObject() || !mSelectedObjects->getPrimaryObject()->isAvatar())
                 && !mSelectedObjects->isAttachment()