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

Code cleanup and performace enacment.

Techwolf Lupindo 2011-10-29 13:47:23 -04:00
parent 281bf13063
commit 6be90572d9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llviewerobject.cpp
View File

@ -2429,10 +2429,11 @@ void LLViewerObject::interpolateLinearMotion(const F64 & time, const F32 & dt)
}
new_pos.mV[VZ] = llmax(min_height, new_pos.mV[VZ]);
if(!gSavedSettings.getBOOL("FSRemoveFlyHeightLimit"))
{
new_pos.mV[VZ] = llmin(LLWorld::getInstance()->getRegionMaxHeight(), new_pos.mV[VZ]);
}
static LLCachedControl<bool> no_fly_height_limit(gSavedSettings, "FSRemoveFlyHeightLimit");
if(!no_fly_height_limit)
{
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);