aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/hippolimits.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/hippolimits.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 '')
-rw-r--r--linden/indra/newview/hippolimits.cpp5
1 files changed, 4 insertions, 1 deletions
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()
24 mMaxPrimScale(256.0f), 24 mMaxPrimScale(256.0f),
25 mMaxLinkedPrims(-1), 25 mMaxLinkedPrims(-1),
26 mMaxDragDistance(0.f), 26 mMaxDragDistance(0.f),
27 mVoiceConnector("SLVoice") 27 mVoiceConnector("SLVoice"),
28 mMaxSelectDistance(64.0f)
28{ 29{
29 setLimits(); 30 setLimits();
30} 31}
@@ -71,6 +72,7 @@ void HippoLimits::setOpenSimLimits()
71 mEnforceMaxBuild = FALSE; 72 mEnforceMaxBuild = FALSE;
72 mRenderWater = TRUE; 73 mRenderWater = TRUE;
73 mVoiceConnector = "SLVoice"; 74 mVoiceConnector = "SLVoice";
75 mMaxSelectDistance = 192.0f;
74 76
75 if (gHippoGridManager->getConnectedGrid()->isRenderCompat()) { 77 if (gHippoGridManager->getConnectedGrid()->isRenderCompat()) {
76 llinfos << "Using rendering compatible OpenSim limits" << llendl; 78 llinfos << "Using rendering compatible OpenSim limits" << llendl;
@@ -114,6 +116,7 @@ void HippoLimits::setSecondLifeLimits()
114 mEnforceMaxBuild = FALSE; 116 mEnforceMaxBuild = FALSE;
115 mRenderWater = TRUE; 117 mRenderWater = TRUE;
116 mVoiceConnector = "SLVoice"; 118 mVoiceConnector = "SLVoice";
119 mMaxSelectDistance = 64.0f;
117} 120}
118 121
119void HippoLimits::setSecondLifeMaxPrimScale() 122void HippoLimits::setSecondLifeMaxPrimScale()