diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llmaniptranslate.cpp | 7 |
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 | |||
69 | const S32 NUM_AXES = 3; | 71 | const S32 NUM_AXES = 3; |
70 | const S32 MOUSE_DRAG_SLOP = 2; // pixels | 72 | const S32 MOUSE_DRAG_SLOP = 2; // pixels |
71 | const F32 HANDLE_HIDE_ANGLE = 0.15f; // radians | 73 | const 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 |