diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2011-03-31 14:07:54 -0700 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2011-03-31 14:07:54 -0700 |
| commit | 0080ed8e2914fba475b224344d8e4233e8fa48e2 (patch) | |
| tree | c316dd991d5b54a19594639686215230a89736b4 /indra/newview/llmaniptranslate.cpp | |
| parent | 0b44850c6f1057cd095ed9fe68f9285e546c662e (diff) | |
| parent | 5c3ae68299f79f3a705fa4b3e9cd262b56695318 (diff) | |
Merge
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; |