1 files changed, 4 insertions, 2 deletions

diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp
index df503ec..77c8bd5 100644
--- a/linden/indra/newview/llmaniprotate.cpp
+++ b/linden/indra/newview/llmaniprotate.cpp
@@ -63,6 +63,8 @@
 #include "lldrawable.h"
 #include "llglheaders.h"
 
+#include "hippolimits.h"
+
 const F32 RADIUS_PIXELS = 100.f;                // size in screen space
 const F32 SQ_RADIUS = RADIUS_PIXELS * RADIUS_PIXELS;
 const F32 WIDTH_PIXELS = 8;
@@ -1124,9 +1126,9 @@ 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 = gSavedSettings.getF32("MaxSelectDistance");
+                                F32 max_select_distance = gHippoLimits->getMaxSelectDistance();
                                 if (dist_vec(gAgent.getPositionAgent(), center) > max_select_distance)
                                 {
                                         visible = FALSE;