summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorJonathan Yap <jhwelch@gmail.com>2018-01-11 18:35:35 -0500
committerJonathan Yap <jhwelch@gmail.com>2018-01-11 18:35:35 -0500
commit32f16633c77564d567ed0752e56eb38abb916ccd (patch)
tree922ebcf5f2dd23fd830605723e79e69907553cad /indra/newview/skins/default/xui/en
parent83809eb6e40b307ec671ff9662ea891de4d75e33 (diff)
STORM-2145 A few small changes
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_camera.xml29
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml2
2 files changed, 8 insertions, 23 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 4eec922915..fdd27b35c2 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -250,18 +250,15 @@
name="buttons"
width="226">
<button
- height="23"
- label=""
+ name="open_prefs_btn"
+ image_overlay="Icon_Gear_Foreground"
+ tool_tip = "Open view preferences"
layout="topleft"
left="70"
- is_toggle="true"
- image_overlay="Cam_Avatar_Off"
- image_selected="PushButton_Selected_Press"
- name="presets_btn"
- tab_stop="false"
- tool_tip="Preset Views"
- top="13"
- width="25">
+ height="23"
+ width="28">
+ <button.commit_callback
+ function="Presets.GoViewPrefs" />
</button>
<button
height="23"
@@ -288,17 +285,5 @@
tool_tip="Camera modes"
width="25">
</button>
-
- <button
- name="open_prefs_btn"
- image_overlay="Icon_Gear_Foreground"
- tool_tip = "Open view preferences"
- left_pad="45"
- height="22"
- width="28">
- <button.commit_callback
- function="Presets.GoViewPrefs" />
- </button>
-
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index c6a42ea612..299f019145 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -108,7 +108,7 @@
<icon
follows="right|top"
height="16"
- image_name="Presets_Icon_Camera"
+ image_name="Cam_Avatar_Off"
left_pad="8"
top="2"
name="presets_icon_camera"