From 231e9eee263a042459d4d0c13343656e2dcfea3f Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 8 Jun 2011 09:37:06 -0700
Subject: 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)
---
 linden/indra/newview/llglsandbox.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'linden/indra/newview/llglsandbox.cpp')

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);
 
-- 
cgit v1.1