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/llpanelobject.cpp | |
| parent | 4839e79b20679560f697af96c11db4aef7e1d740 (diff) | |
| parent | 187b21e6d22204e8989b1c7d5e75f8b7880dd79f (diff) | |
Merge simon_linden/viewer-dev to get avatar motion prediction code.
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()) |