aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/hippolimits.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/hippolimits.cpp')
-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 691508a..4516668 100644
--- a/linden/indra/newview/hippolimits.cpp
+++ b/linden/indra/newview/hippolimits.cpp
@@ -22,7 +22,8 @@ HippoLimits::HippoLimits()
22 mMinPrimScale(0.001f), 22 mMinPrimScale(0.001f),
23 mMaxPrimScale(256.0f), 23 mMaxPrimScale(256.0f),
24 mMaxLinkedPrims(-1), 24 mMaxLinkedPrims(-1),
25 mMaxDragDistance(0.f) 25 mMaxDragDistance(0.f),
26 mVoiceConnector("SLVoice")
26{ 27{
27 setLimits(); 28 setLimits();
28} 29}
@@ -68,6 +69,7 @@ void HippoLimits::setOpenSimLimits()
68 mEnableTeenMode = FALSE; 69 mEnableTeenMode = FALSE;
69 mEnforceMaxBuild = FALSE; 70 mEnforceMaxBuild = FALSE;
70 mRenderWater = TRUE; 71 mRenderWater = TRUE;
72 mVoiceConnector = "SLVoice";
71 73
72 if (gHippoGridManager->getConnectedGrid()->isRenderCompat()) { 74 if (gHippoGridManager->getConnectedGrid()->isRenderCompat()) {
73 llinfos << "Using rendering compatible OpenSim limits" << llendl; 75 llinfos << "Using rendering compatible OpenSim limits" << llendl;
@@ -110,6 +112,7 @@ void HippoLimits::setSecondLifeLimits()
110 mEnableTeenMode = FALSE; 112 mEnableTeenMode = FALSE;
111 mEnforceMaxBuild = FALSE; 113 mEnforceMaxBuild = FALSE;
112 mRenderWater = TRUE; 114 mRenderWater = TRUE;
115 mVoiceConnector = "SLVoice";
113} 116}
114 117
115F32 HippoLimits::getMaxPrimScale() const 118F32 HippoLimits::getMaxPrimScale() const