diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-30 14:27:59 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-30 14:27:59 -0400 |
| commit | 98457f845509f1434d8943a2ebff14c9b1ab7d2d (patch) | |
| tree | e69f5e4b935ceb4c8235fb6336e2276c90da76b7 /indra/newview | |
| parent | 6fa682bb7777bacce10841e842886fc3c1ef8989 (diff) | |
| parent | 8593020037ab299f945ee2ad425ccb79ceba42cf (diff) | |
merge changes for storm-1852
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index cd300accb7..da72f2fdac 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2389,10 +2389,11 @@ void LLViewerObject::interpolateLinearMotion(const F64 & time, const F32 & dt) { // This will put the object underground, but we can't tell if it will stop // at ground level or not min_height = LLWorld::getInstance()->getMinAllowedZ(this, new_pos_global); + // Cap maximum height + new_pos.mV[VZ] = llmin(LLWorld::getInstance()->getRegionMaxHeight(), new_pos.mV[VZ]); } new_pos.mV[VZ] = llmax(min_height, new_pos.mV[VZ]); - new_pos.mV[VZ] = llmin(LLWorld::getInstance()->getRegionMaxHeight(), new_pos.mV[VZ]); // Check to see if it's going off the region LLVector3 temp(new_pos); |