diff options
author | Oz Linden <oz@lindenlab.com> | 2010-11-08 16:47:46 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-11-08 16:47:46 -0500 |
commit | b657516f72f016a918e0ff627105dd380a94394c (patch) | |
tree | 7d30ace2d3cba42c5f7de1c3dd23748e31b2803f /indra/newview/llfloaterworldmap.cpp | |
parent | 451d115c1009ded2b2d74efefbe0611c62343eed (diff) | |
parent | c446062bd3bd3f172b20f22f2086cea962fb7278 (diff) |
pull beta changes back to 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 ); |