diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-26 12:04:40 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-26 12:04:40 -0700 |
| commit | cdd930d360b2cddf9b31531310f958f029423d7f (patch) | |
| tree | 738684fe419cc782d70935b937cecea9a149318f /indra/newview/llfloaterworldmap.cpp | |
| parent | ebce1a4ea8dedcef25c82fa5d877d780b12a3a8f (diff) | |
| parent | 01e5519323415b331fa3202f95d63e3158b199ad (diff) | |
STORM-454 : merge with viewer-development
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
| -rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 7236894542..ba0eb8a711 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -635,7 +635,7 @@ void LLFloaterWorldMap::updateTeleportCoordsDisplay( const LLVector3d& pos ) // convert global specified position to a local one F32 region_local_x = (F32)fmod( pos.mdV[VX], (F64)REGION_WIDTH_METERS ); F32 region_local_y = (F32)fmod( pos.mdV[VY], (F64)REGION_WIDTH_METERS ); - F32 region_local_z = (F32)fmod( pos.mdV[VZ], (F64)REGION_WIDTH_METERS ); + F32 region_local_z = (F32)llclamp( pos.mdV[VZ], 0.0, (F64)REGION_HEIGHT_METERS ); // write in the values childSetValue("teleport_coordinate_x", region_local_x ); |