summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-10-05 07:47:56 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-10-05 07:47:56 +0000
commitf9788fa6ce0196ffaba6cdcb0fda3ef5cbfe3265 (patch)
tree7e9986aa1f645883bfeda4e64e90e3876849cba9 /indra/newview/skins/default/xui/en
parent2451b82d8ac45c12f4b3ba821ca102cdfbecf36c (diff)
merge -r 1890-1893 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
* Bugs: EXT-1217, EXT-1274, EXT-1272 * Dev: EXT-1101
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_camera.xml8
-rw-r--r--indra/newview/skins/default/xui/en/floater_moveview.xml10
-rw-r--r--indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml3
3 files changed, 11 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 0784b88944..c4a2654403 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -5,7 +5,7 @@
can_close="false"
center_horiz="true"
follows="top"
- height="95"
+ height="110"
layout="topleft"
name="camera_floater"
help_topic="camera_floater"
@@ -26,7 +26,7 @@
</floater.string>
<panel
border="true"
- height="64"
+ height="79"
layout="topleft"
left="0"
top="0"
@@ -46,7 +46,7 @@
scale_image="false"
sound_flags="3"
tool_tip="Orbit Camera Around Focus"
- top="0"
+ top="15"
width="64" />
<joystick_track
follows="top|left"
@@ -61,7 +61,7 @@
scale_image="false"
sound_flags="3"
tool_tip="Move Camera Up and Down, Left and Right"
- top="0"
+ top="15"
visible="false"
width="64" />
<joystick_zoom
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 82acea47be..65235da8d5 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -5,7 +5,7 @@
can_minimize="false"
center_horiz="true"
follows="bottom"
- height="95"
+ height="110"
layout="topleft"
name="move_floater"
help_topic="move_floater"
@@ -38,7 +38,7 @@
</string>
<panel
border="true"
- height="70"
+ height="83"
follows="left|top"
layout="topleft"
left="0"
@@ -57,7 +57,7 @@
picture_style="true"
scale_image="false"
tool_tip="Turn Left (press Left Arrow or A)"
- top="35"
+ top="45"
width="25" />
<button
follows="left|bottom"
@@ -83,7 +83,7 @@
picture_style="true"
scale_image="false"
tool_tip="Fly Up, Press &quot;E&quot;"
- top="4"
+ top="14"
width="25" />
<button
follows="left|bottom"
@@ -130,7 +130,7 @@
<!-- Width and height of this panel should be synchronized with panel_stand_stop_flying.xml -->
<panel
border="true"
- height="25"
+ height="27"
layout="topleft"
left="0"
name="panel_modes"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
index aa76a61c15..3b1b049ff2 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
@@ -28,7 +28,8 @@
name="show_help"
top="5"
right="-8"
- width="28">
+ width="28"
+ tool_tip="Show Help">
<button.commit_callback
function="Button.ShowHelp" />
</button>