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/llpanelobject.cpp | |
| parent | ef46e7037ca59224dfcdf3745e165ee97b086a69 (diff) | |
| parent | 5cbbb565f1bba870ec6db0b266e8768ecbdb7826 (diff) | |
merge fix for STORM-579
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()) |