From 8593020037ab299f945ee2ad425ccb79ceba42cf Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 11 May 2012 11:33:03 -0400
Subject: [PATCH] STORM-1852 Altitude display stutters or is clamped when
flying higher than 4096m
---
doc/contributions.txt | 1 +
indra/newview/llviewerobject.cpp | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 3851e62cfbd..6370e14f48d 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -625,6 +625,7 @@ Jonathan Yap
STORM-1809
STORM-1793
STORM-1810
+ STORM-1852
Kadah Coba
STORM-1060
Jondan Lundquist
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index e590f29a9a3..7c6ca908907 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2382,10 +2382,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);
--
GitLab