diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 16:59:43 -0800 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 16:59:43 -0800 |
| commit | 5cbbb565f1bba870ec6db0b266e8768ecbdb7826 (patch) | |
| tree | fd00c91dc7a90fe4de3b52ce07548e1e4ef1e960 /indra/newview/llmaniptranslate.cpp | |
| parent | 4839e79b20679560f697af96c11db4aef7e1d740 (diff) | |
| parent | 187b21e6d22204e8989b1c7d5e75f8b7880dd79f (diff) | |
Merge simon_linden/viewer-dev to get avatar motion prediction code.
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; |