diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:34:30 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:34:30 -0500 |
| commit | a9eb639511a09dc072e67e10d8885a0b4f7587da (patch) | |
| tree | 59403ee97fe873b3a6db42c9d6b3676c72b481f7 /indra/newview/llpanelobject.cpp | |
| parent | b2fcba25c8dd04318420af30f877b0984a524055 (diff) | |
| parent | e08250d0874247c7c2c0acb025602e4299244d83 (diff) | |
Automated merge with https://bitbucket.org/vadim_productengine/storm-52
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index d756a1b931..a0c320ba19 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1695,10 +1695,10 @@ void LLPanelObject::sendPosition(BOOL btn_down) LLVector3 newpos(mCtrlPosX->get(), mCtrlPosY->get(), mCtrlPosZ->get()); LLViewerRegion* regionp = mObject->getRegion(); - + // Clamp the Z height const F32 height = newpos.mV[VZ]; - const F32 min_height = LLWorld::getInstance()->getMinAllowedZ(mObject); + const F32 min_height = LLWorld::getInstance()->getMinAllowedZ(mObject, mObject->getPositionGlobal()); const F32 max_height = LLWorld::getInstance()->getRegionMaxHeight(); if (!mObject->isAttachment()) |