diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:27:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:27:50 -0500 |
| commit | 0cd40b4409b237093a771b28933ac2a33fa9f266 (patch) | |
| tree | 6aec2ccf66265722f4cb6f16774b54a7fa3eca49 /indra/newview/llmaniptranslate.cpp | |
| parent | ef46e7037ca59224dfcdf3745e165ee97b086a69 (diff) | |
| parent | 5cbbb565f1bba870ec6db0b266e8768ecbdb7826 (diff) | |
merge fix for STORM-579
Diffstat (limited to 'indra/newview/llmaniptranslate.cpp')
| -rw-r--r-- | indra/newview/llmaniptranslate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index 5eb3b789f2..f871df0c36 100644 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -726,7 +726,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask) LLVector3d new_position_global = selectNode->mSavedPositionGlobal + clamped_relative_move; // Don't let object centers go too far underground - F64 min_height = LLWorld::getInstance()->getMinAllowedZ(object); + F64 min_height = LLWorld::getInstance()->getMinAllowedZ(object, object->getPositionGlobal()); if (new_position_global.mdV[VZ] < min_height) { new_position_global.mdV[VZ] = min_height; |