diff options
| author | Tofu Buzzard <no-email> | 2010-10-27 11:03:39 +0100 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-10-27 11:03:39 +0100 |
| commit | 179e9e37ecbdcd1ad2133733047707ddd42e8c30 (patch) | |
| tree | db3d1d07ea7e2c769562eeb2f5ad09587df376f6 /indra/newview/llfloaterworldmap.cpp | |
| parent | 26700e0d40c5f650e713f5209dd80b5df84b2b5a (diff) | |
| parent | 8947724baa6d595844daeee2f18c865d1886acc5 (diff) | |
merge from 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 ); |