1 files changed, 11 insertions, 9 deletions

diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 40dc211..460611a 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -79,7 +79,7 @@
 // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
 #include "llvoavatar.h"
 // [/RLVa:KB]
-
+#include "hippoLimits.h"
 //
 // Constants
 //
@@ -426,6 +426,8 @@ void LLPanelObject::getState( )
         mCtrlPosY->setEnabled(enable_move);
         mCtrlPosZ->setEnabled(enable_move);
 
+        mCtrlPosZ->setMaxValue(gHippoLimits->getMaxHeight());
+
         if (enable_scale)
         {
                 vec = objectp->getScale();
@@ -632,9 +634,9 @@ void LLPanelObject::getState( )
         }
         else
         {
-                mCtrlScaleX->setMaxValue(LLManipScale::getMaxPrimSize());
-                mCtrlScaleY->setMaxValue(LLManipScale::getMaxPrimSize());
-                mCtrlScaleZ->setMaxValue(LLManipScale::getMaxPrimSize());
+                mCtrlScaleX->setMaxValue(gHippoLimits->getMaxPrimScale());
+                mCtrlScaleY->setMaxValue(gHippoLimits->getMaxPrimScale());
+                mCtrlScaleZ->setMaxValue(gHippoLimits->getMaxPrimScale());
 
                 // Only allowed to change these parameters for objects
                 // that you have permissions on AND are not attachments.
@@ -993,9 +995,9 @@ void LLPanelObject::getState( )
                 mSpinScaleY->set( scale_y );
                 calcp->setVar(LLCalc::X_HOLE, scale_x);
                 calcp->setVar(LLCalc::Y_HOLE, scale_y);
-                mSpinScaleX->setMinValue(OBJECT_MIN_HOLE_SIZE);
+                mSpinScaleX->setMinValue(gHippoLimits->getMinHoleSize());
                 mSpinScaleX->setMaxValue(OBJECT_MAX_HOLE_SIZE_X);
-                mSpinScaleY->setMinValue(OBJECT_MIN_HOLE_SIZE);
+                mSpinScaleY->setMinValue(gHippoLimits->getMinHoleSize());
                 mSpinScaleY->setMaxValue(OBJECT_MAX_HOLE_SIZE_Y);
                 break;
         default:
@@ -1031,7 +1033,7 @@ void LLPanelObject::getState( )
         else 
         {
                 mSpinHollow->setMinValue(0.f);
-                mSpinHollow->setMaxValue(95.f);
+                mSpinHollow->setMaxValue(gHippoLimits->getMaxHollow() * 100.0f);
         }
 
         // Update field enablement
@@ -1583,11 +1585,11 @@ void LLPanelObject::getVolumeParams(LLVolumeParams& volume_params)
         {
                 scale_x = llclamp(
                         scale_x,
-                        OBJECT_MIN_HOLE_SIZE,
+                        gHippoLimits->getMinHoleSize(),
                         OBJECT_MAX_HOLE_SIZE_X);
                 scale_y = llclamp(
                         scale_y,
-                        OBJECT_MIN_HOLE_SIZE,
+                        gHippoLimits->getMinHoleSize(),
                         OBJECT_MAX_HOLE_SIZE_Y);
 
                 // Limit radius offset, based on taper and hole size y.