1 files changed, 5 insertions, 3 deletions

diff --git a/linden/indra/newview/hippolimits.cpp b/linden/indra/newview/hippolimits.cpp
index 2c581ae..d6d6c36 100644
--- a/linden/indra/newview/hippolimits.cpp
+++ b/linden/indra/newview/hippolimits.cpp
@@ -17,7 +17,7 @@ HippoLimits *gHippoLimits = 0;
 HippoLimits::HippoLimits() 
 :
         mMaxAgentGroups(100),
-        mMaxHeight(10000.0f),
+        mMaxHeight(16383.0f),
         mMinHoleSize(0.05f),
         mMaxHollow(0.95f),
         mMinPrimScale(0.001f),
@@ -59,7 +59,7 @@ void HippoLimits::setOpenSimLimits()
         mMaxPrimXPos = F32_MAX;
         mMaxPrimYPos = F32_MAX;
         mMaxPrimZPos = F32_MAX;
-        mMaxHeight = 10000.0f;
+        mMaxHeight = 16383.0f;
         mMaxLinkedPrims = -1;
         mMaxPhysLinkedPrims = -1;
         mAllowParcelWindLight = TRUE;
@@ -150,7 +150,9 @@ F32 HippoLimits::getMinPrimScale() const
 {
         if (gSavedSettings.getBOOL("DisableMaxBuildConstraints") && !mEnforceMaxBuild)
         {
-                return 0;
+                // Don't return 0, that causes a few bugs when it's used to creat objects zero sized.
+                // 0.00001 should be the minimum the edit controls can display anyway.
+                return 0.00001f;
         }
         else
         {