1 files changed, 32 insertions, 7 deletions

diff --git a/linden/indra/newview/hippoLimits.cpp b/linden/indra/newview/hippoLimits.cpp
index 35afcf9..0777ca3 100644
--- a/linden/indra/newview/hippoLimits.cpp
+++ b/linden/indra/newview/hippoLimits.cpp
@@ -5,6 +5,7 @@
 #include "hippoLimits.h"
 
 #include "hippoGridManager.h"
+#include "llviewercontrol.h"
 
 #include <llerror.h>
 
@@ -12,7 +13,15 @@
 HippoLimits *gHippoLimits = 0;
 
 
-HippoLimits::HippoLimits()
+HippoLimits::HippoLimits() 
+:
+        mMaxAgentGroups(100),
+        mMaxHeight(10000.0f),
+        mMinHoleSize(0.05f),
+        mMaxHollow(0.95f),
+        mMinPrimScale(0.001f),
+        mMaxPrimScale(256.0f),
+        mMaxLinkedPrims(-1)
 {
         setLimits();
 }
@@ -20,9 +29,12 @@ HippoLimits::HippoLimits()
 
 void HippoLimits::setLimits()
 {
-        if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) {
+        if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) 
+        {
                 setSecondLifeLimits();
-        } else {
+        } 
+        else 
+        {
                 setOpenSimLimits();
         }
 }
@@ -37,11 +49,13 @@ void HippoLimits::setOpenSimLimits()
         mMaxLinkedPrims = -1;
 
         if (gHippoGridManager->getConnectedGrid()->isRenderCompat()) {
-                llinfos << "Using rendering compatible OpenSim limits." << llendl;
+                llinfos << "Using rendering compatible OpenSim limits" << llendl;
                 mMinHoleSize = 0.05f;  
                 mMaxHollow = 0.95f;
-        } else {
-                llinfos << "Using Hippo OpenSim limits." << llendl;
+        } 
+        else 
+        {
+                llinfos << "Using Hippo OpenSim limits" << llendl;
                 mMinHoleSize = 0.01f;
                 mMaxHollow = 0.99f;
         }
@@ -49,7 +63,7 @@ void HippoLimits::setOpenSimLimits()
 
 void HippoLimits::setSecondLifeLimits()
 {
-        llinfos << "Using Second Life limits." << llendl;
+        llinfos << "Using Second Life limits" << llendl;
         mMaxAgentGroups = 25;
         mMaxPrimScale = 10.0f;
         mMinPrimScale = 0.01f;
@@ -59,3 +73,14 @@ void HippoLimits::setSecondLifeLimits()
         mMaxLinkedPrims = 255;
 }
 
+F32 HippoLimits::getMaxPrimScale() const
+{
+        if (gSavedSettings.getBOOL("DisableMaxBuildConstraints"))
+        {
+                return FLT_MAX;
+        }
+        else
+        {
+                return mMaxPrimScale;
+        }
+}