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

STORM-454 : merge with viewer-development

meow-7.2.2
Merov Linden 2010-10-26 12:04:40 -07:00
parent ebce1a4ea8 01e5519323
commit cdd930d360
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterworldmap.cpp
View File

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

12
indra/newview/skins/default/xui/en/floater_world_map.xml
View File

@ -541,7 +541,7 @@
halign="right"
height="16"
layout="topleft"
left="25"
left="15"
name="events_label"
top_pad="16"
width="70">
@ -574,7 +574,8 @@
left_delta="47"
max_val="255"
min_val="0"
name="teleport_coordinate_y" >
name="teleport_coordinate_y"
width="44" >
<spinner.commit_callback
function="WMap.Coordinates" />
</spinner>
@ -584,12 +585,13 @@
follows="right|bottom"
height="23"
increment="1"
initial_value="128"
initial_value="23"
layout="topleft"
left_delta="47"
max_val="255"
max_val="4096"
min_val="0"
name="teleport_coordinate_z">
name="teleport_coordinate_z"
width="55" >
<spinner.commit_callback
function="WMap.Coordinates" />
</spinner>