Removed debug setting MaxSelectDistance...

... in favor of setting the select distance differently between
opensim and second life in the hippo limits

(cherry picked from commit 2545b11e06538010bd5ddb46499920a43889ed0f)

10 files changed, 25 insertions, 21 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 57c2065..2c5d858 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -8188,17 +8188,6 @@
       <key>Value</key>
       <real>48.0</real>
     </map>
-    <key>MaxSelectDistance</key>
-    <map>
-      <key>Comment</key>
-      <string>Maximum allowed selection distance (meters from avatar)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>64.0</real>
-    </map>
     <key>MeanCollisionBump</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/hippolimits.cpp b/linden/indra/newview/hippolimits.cpp
index 2990a45..2c581ae 100644
--- a/linden/indra/newview/hippolimits.cpp
+++ b/linden/indra/newview/hippolimits.cpp
@@ -24,7 +24,8 @@ HippoLimits::HippoLimits()
         mMaxPrimScale(256.0f),
         mMaxLinkedPrims(-1),
         mMaxDragDistance(0.f),
-        mVoiceConnector("SLVoice")
+        mVoiceConnector("SLVoice"),
+        mMaxSelectDistance(64.0f)
 {
         setLimits();
 }
@@ -71,6 +72,7 @@ void HippoLimits::setOpenSimLimits()
         mEnforceMaxBuild = FALSE;
         mRenderWater = TRUE;
         mVoiceConnector = "SLVoice";
+        mMaxSelectDistance = 192.0f;
 
         if (gHippoGridManager->getConnectedGrid()->isRenderCompat()) {
                 llinfos << "Using rendering compatible OpenSim limits" << llendl;
@@ -114,6 +116,7 @@ void HippoLimits::setSecondLifeLimits()
         mEnforceMaxBuild = FALSE;
         mRenderWater = TRUE;
         mVoiceConnector = "SLVoice";
+        mMaxSelectDistance = 64.0f;
 }
 
 void HippoLimits::setSecondLifeMaxPrimScale()
diff --git a/linden/indra/newview/hippolimits.h b/linden/indra/newview/hippolimits.h
index d63d1b0..9cc6160 100644
--- a/linden/indra/newview/hippolimits.h
+++ b/linden/indra/newview/hippolimits.h
@@ -15,6 +15,7 @@ public:
         const S32&      getMaxPhysLinkedPrims() const { return mMaxPhysLinkedPrims; }
         const F32&      getMaxInventoryItemsTransfer() const { return mMaxInventoryItemsTransfer; }
         const std::string& getVoiceConnector()  const { return mVoiceConnector; }
+        const F32&      getMaxSelectDistance()  const { return mMaxSelectDistance; }
 
         // Returns the max prim size we can use on a grid
         F32             getMinPrimScale() const;
@@ -46,6 +47,7 @@ public:
         F32             mMinPrimXPos;
         F32             mMinPrimYPos;
         F32             mMinPrimZPos;
+        F32             mMaxSelectDistance;
 
         S32     mRenderName;
 
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index 96fd39b..89f9ffa 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -68,6 +68,8 @@
 #include "llresmgr.h"
 #include "pipeline.h"
 #include "llspatialpartition.h"
+
+#include "hippolimits.h"
  
 // [RLVa:KB]
 #include "rlvhandler.h"
@@ -180,7 +182,7 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
 // [/RLVa:KB]
 
         LLVector3 av_pos = gAgent.getPositionAgent();
-        F32 select_dist_squared = gSavedSettings.getF32("MaxSelectDistance");
+        F32 select_dist_squared = gHippoLimits->getMaxSelectDistance();
         select_dist_squared = select_dist_squared * select_dist_squared;
 
         BOOL deselect = (mask == MASK_CONTROL);
@@ -235,8 +237,8 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
                 LLVector3 relative_av_pos = av_pos;
                 relative_av_pos -= LLViewerCamera::getInstance()->getOrigin();
 
-                F32 new_far = relative_av_pos * LLViewerCamera::getInstance()->getAtAxis() + gSavedSettings.getF32("MaxSelectDistance");
-                F32 new_near = relative_av_pos * LLViewerCamera::getInstance()->getAtAxis() - gSavedSettings.getF32("MaxSelectDistance");
+                F32 new_far = relative_av_pos * LLViewerCamera::getInstance()->getAtAxis() + gHippoLimits->getMaxSelectDistance();
+                F32 new_near = relative_av_pos * LLViewerCamera::getInstance()->getAtAxis() - gHippoLimits->getMaxSelectDistance();
 
                 new_near = llmax(new_near, 0.1f);
 
diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp
index df503ec..b094328 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;
@@ -1126,7 +1128,7 @@ BOOL LLManipRotate::updateVisiblity()
                         // Don't drag manip if object too far away
                         if (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;
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index b38abe4..32709fd 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -238,7 +238,7 @@ void LLManipScale::render()
                         // Don't draw manip if object too far away
                         if (gSavedSettings.getBOOL("LimitSelectDistance"))
                         {
-                                F32 max_select_distance = gSavedSettings.getF32("MaxSelectDistance");
+                                F32 max_select_distance = gHippoLimits->getMaxSelectDistance();
                                 if (range_from_agent > max_select_distance)
                                 {
                                         return;
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index 3b78553..c113446 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -1823,7 +1823,7 @@ void LLManipTranslate::renderTranslationHandles()
                 // Don't draw handles if you're too far away
                 if (gSavedSettings.getBOOL("LimitSelectDistance"))
                 {
-                        if (range_from_agent > gSavedSettings.getF32("MaxSelectDistance"))
+                        if (range_from_agent > gHippoLimits->getMaxSelectDistance())
                         {
                                 return;
                         }
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index f1092e7..ba73324 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -92,6 +92,8 @@
 
 #include "llglheaders.h"
 
+#include "hippolimits.h"
+
 // [RLVa:KB]
 #include "rlvhandler.h"
 // [/RLVa:KB]
@@ -3500,9 +3502,9 @@ void LLSelectMgr::deselectAllIfTooFar()
                 && !mSelectedObjects->isAttachment()
                 && !selectionCenter.isExactlyZero())
         {
-//              F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance");
+//              F32 deselect_dist = gHippoLimits->getMaxSelectDistance();
 // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
-                F32 deselect_dist = (!fRlvFartouch) ? gSavedSettings.getF32("MaxSelectDistance") : 1.5f;
+                F32 deselect_dist = (!fRlvFartouch) ? gHippoLimits->getMaxSelectDistance() : 1.5f;
 // [/RLVa:KB]
                 F32 deselect_dist_sq = deselect_dist * deselect_dist;
 
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index 52053f5..9f5eb09 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -69,6 +69,8 @@
 #include "llviewerparcelmgr.h" // RezWithLandGroup
 #include "roles_constants.h" // Ele: Land Group Override
 
+#include "hippolimits.h"
+
 // [RLVa:KB]
 #include "rlvhandler.h"
 // [/RLVa:KB]
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index 16f6e57..fecab65 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -51,6 +51,8 @@
 #include "lltoolmgr.h"
 #include "llviewerjoystick.h"
 
+#include "hippolimits.h"
+
 //glu pick matrix implementation borrowed from Mesa3D
 glh::matrix4f gl_pick_matrix(GLfloat x, GLfloat y, GLfloat width, GLfloat height, GLint* viewport)
 {
@@ -334,7 +336,7 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
                 if (limit_select_distance)
                 {
                         // ...select distance from control
-                        z_far = gSavedSettings.getF32("MaxSelectDistance");
+                        z_far = gHippoLimits->getMaxSelectDistance();
                 }
                 else
                 {