aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llmaniptranslate.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-03-29 15:50:33 +0200
committerArmin Weatherwax2010-04-12 17:11:05 +0200
commit3fbbd9e0b7516d1c170267acc26a767af1fa4b1d (patch)
treeed49e0dcd64f1244fbbfea6bc844ab2788eaaa50 /linden/indra/newview/llmaniptranslate.cpp
parentUse Hippogridmanager for OpenSim detection. (diff)
downloadmeta-impy-3fbbd9e0b7516d1c170267acc26a767af1fa4b1d.zip
meta-impy-3fbbd9e0b7516d1c170267acc26a767af1fa4b1d.tar.gz
meta-impy-3fbbd9e0b7516d1c170267acc26a767af1fa4b1d.tar.bz2
meta-impy-3fbbd9e0b7516d1c170267acc26a767af1fa4b1d.tar.xz
support more OpenSim limits (number of groups, hollow size)
Diffstat (limited to 'linden/indra/newview/llmaniptranslate.cpp')
-rw-r--r--linden/indra/newview/llmaniptranslate.cpp7
1 files changed, 5 insertions, 2 deletions
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 @@
66#include "llui.h" 66#include "llui.h"
67#include "pipeline.h" 67#include "pipeline.h"
68 68
69#include "hippoLimits.h"
70
69const S32 NUM_AXES = 3; 71const S32 NUM_AXES = 3;
70const S32 MOUSE_DRAG_SLOP = 2; // pixels 72const S32 MOUSE_DRAG_SLOP = 2; // pixels
71const F32 HANDLE_HIDE_ANGLE = 0.15f; // radians 73const F32 HANDLE_HIDE_ANGLE = 0.15f; // radians
@@ -731,9 +733,10 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
731 } 733 }
732 734
733 // For safety, cap heights where objects can be dragged 735 // For safety, cap heights where objects can be dragged
734 if (new_position_global.mdV[VZ] > MAX_OBJECT_Z) 736 float maxHeight = gHippoLimits->getMaxHeight();
737 if (new_position_global.mdV[VZ] > maxHeight)
735 { 738 {
736 new_position_global.mdV[VZ] = MAX_OBJECT_Z; 739 new_position_global.mdV[VZ] = maxHeight;
737 } 740 }
738 741
739 // Grass is always drawn on the ground, so clamp its position to the ground 742 // Grass is always drawn on the ground, so clamp its position to the ground