livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-1852 Altitude display stutters or is clamped when flying higher than 4096m

meow-7.2.2
Jonathan Yap 2012-05-11 11:33:03 -04:00
parent d6569db352
commit 8593020037
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -625,6 +625,7 @@ Jonathan Yap
STORM-1809
STORM-1793
STORM-1810
STORM-1852
Kadah Coba
STORM-1060
Jondan Lundquist

3
indra/newview/llviewerobject.cpp
View File

@ -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);