diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-04 17:07:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-04 17:07:27 -0400 |
| commit | 13ca132037e4b8c5b954e0cfe44a9713709bf041 (patch) | |
| tree | 7b90c75957f31f5a149a39b0758ca51545f5a4b3 /indra/newview/llviewerobject.cpp | |
| parent | e2eafb565f95e818b842e4bad94d323f0b4da86b (diff) | |
| parent | 503d394fb57c9043114dfe28ef2836f799142747 (diff) | |
merge changes for DRTVWR-157
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -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); |