From 3fbbd9e0b7516d1c170267acc26a767af1fa4b1d Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Mon, 29 Mar 2010 15:50:33 +0200
Subject: support more OpenSim limits (number of groups, hollow size)

---
 linden/indra/newview/llmaniptranslate.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/llmaniptranslate.cpp')

diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index 8d23e40..1362f0a 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -66,6 +66,8 @@
 #include "llui.h"
 #include "pipeline.h"
 
+#include "hippoLimits.h"
+
 const S32 NUM_AXES = 3;
 const S32 MOUSE_DRAG_SLOP = 2;       // pixels
 const F32 HANDLE_HIDE_ANGLE = 0.15f; // radians
@@ -731,9 +733,10 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 				}
 
 				// For safety, cap heights where objects can be dragged
-				if (new_position_global.mdV[VZ] > MAX_OBJECT_Z)
+				float maxHeight = gHippoLimits->getMaxHeight();
+				if (new_position_global.mdV[VZ] > maxHeight)
 				{
-					new_position_global.mdV[VZ] = MAX_OBJECT_Z;
+					new_position_global.mdV[VZ] = maxHeight;
 				}
 
 				// Grass is always drawn on the ground, so clamp its position to the ground
-- 
cgit v1.1