aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llglsandbox.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-06-08 09:37:06 -0700
committerJacek Antonelli2011-06-09 23:11:58 -0500
commit231e9eee263a042459d4d0c13343656e2dcfea3f (patch)
tree08b85cd604a232943225b2a9bea4cd06fa05f4e6 /linden/indra/newview/llglsandbox.cpp
parentAdded copy group link button to create clickable links to groups in the viewer (diff)
downloadmeta-impy-231e9eee263a042459d4d0c13343656e2dcfea3f.zip
meta-impy-231e9eee263a042459d4d0c13343656e2dcfea3f.tar.gz
meta-impy-231e9eee263a042459d4d0c13343656e2dcfea3f.tar.bz2
meta-impy-231e9eee263a042459d4d0c13343656e2dcfea3f.tar.xz
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)
Diffstat (limited to 'linden/indra/newview/llglsandbox.cpp')
-rw-r--r--linden/indra/newview/llglsandbox.cpp8
1 files changed, 5 insertions, 3 deletions
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 @@
68#include "llresmgr.h" 68#include "llresmgr.h"
69#include "pipeline.h" 69#include "pipeline.h"
70#include "llspatialpartition.h" 70#include "llspatialpartition.h"
71
72#include "hippolimits.h"
71 73
72// [RLVa:KB] 74// [RLVa:KB]
73#include "rlvhandler.h" 75#include "rlvhandler.h"
@@ -180,7 +182,7 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
180// [/RLVa:KB] 182// [/RLVa:KB]
181 183
182 LLVector3 av_pos = gAgent.getPositionAgent(); 184 LLVector3 av_pos = gAgent.getPositionAgent();
183 F32 select_dist_squared = gSavedSettings.getF32("MaxSelectDistance"); 185 F32 select_dist_squared = gHippoLimits->getMaxSelectDistance();
184 select_dist_squared = select_dist_squared * select_dist_squared; 186 select_dist_squared = select_dist_squared * select_dist_squared;
185 187
186 BOOL deselect = (mask == MASK_CONTROL); 188 BOOL deselect = (mask == MASK_CONTROL);
@@ -235,8 +237,8 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
235 LLVector3 relative_av_pos = av_pos; 237 LLVector3 relative_av_pos = av_pos;
236 relative_av_pos -= LLViewerCamera::getInstance()->getOrigin(); 238 relative_av_pos -= LLViewerCamera::getInstance()->getOrigin();
237 239
238 F32 new_far = relative_av_pos * LLViewerCamera::getInstance()->getAtAxis() + gSavedSettings.getF32("MaxSelectDistance"); 240 F32 new_far = relative_av_pos * LLViewerCamera::getInstance()->getAtAxis() + gHippoLimits->getMaxSelectDistance();
239 F32 new_near = relative_av_pos * LLViewerCamera::getInstance()->getAtAxis() - gSavedSettings.getF32("MaxSelectDistance"); 241 F32 new_near = relative_av_pos * LLViewerCamera::getInstance()->getAtAxis() - gHippoLimits->getMaxSelectDistance();
240 242
241 new_near = llmax(new_near, 0.1f); 243 new_near = llmax(new_near, 0.1f);
242 244