summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/textures/icons/Presets_Icon.png (renamed from indra/newview/skins/default/textures/icons/FastPrefs_Icon.png)bin268 -> 268 bytes
-rwxr-xr-xindra/newview/skins/default/textures/textures.xml2
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_preferences_graphics1.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_presets_pulldown.xml40
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_status_bar.xml7
5 files changed, 47 insertions, 8 deletions
diff --git a/indra/newview/skins/default/textures/icons/FastPrefs_Icon.png b/indra/newview/skins/default/textures/icons/Presets_Icon.png
index 380d3812d8..380d3812d8 100644
--- a/indra/newview/skins/default/textures/icons/FastPrefs_Icon.png
+++ b/indra/newview/skins/default/textures/icons/Presets_Icon.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 2dbf9d1bab..feddb04a56 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -204,7 +204,7 @@ with the same filename but different name
<texture name="Facebook_Icon" file_name="icons/Facebook.png" preload="false" />
- <texture name="FastPrefs_Icon" file_name="icons/FastPrefs_Icon.png" preload="true" />
+ <texture name="Presets_Icon" file_name="icons/Presets_Icon.png" preload="true" />
<texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
<texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 2cbba946d4..d8095c0476 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -37,14 +37,14 @@
<button
follows="top|left"
height="23"
- label="Save As..."
+ label="Save..."
layout="topleft"
left_pad="5"
- name="PrefSaveAsButton"
+ name="PrefSaveButton"
top_delta="0"
width="115">
<button.commit_callback
- function="Pref.PrefSaveAs" />
+ function="Pref.PrefSave" />
</button>
<button
follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
new file mode 100644
index 0000000000..697bfd58e7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="true"
+ bg_opaque_image="Volume_Background"
+ bg_alpha_image="Volume_Background"
+ border_visible="false"
+ border="false"
+ chrome="true"
+ follows="bottom"
+ height="155"
+ layout="topleft"
+ name="presets_pulldown"
+ width="225">
+ <button
+ name="open_prefs_btn"
+ image_overlay="Icon_Gear_Foreground"
+ hover_glow_amount="0.15"
+ tool_tip = "Bring up graphics prefs"
+ top="5"
+ left="5"
+ height="20"
+ width="20">
+ <button.commit_callback
+ function="Presets.GoGraphicsPrefs" />
+ </button>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ top_delta="4"
+ left_delta="25"
+ font.style="BOLD"
+ name="Graphic Presets"
+ width="120">
+ Graphic Presets
+ </text>
+</panel>
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 a1f7503269..bb38c384a8 100755
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -105,14 +105,13 @@
width="145">
24:00 AM PST
</text>
- <button
+ <icon
follows="right|top"
height="16"
- image_unselected="FastPrefs_Icon"
- image_selected="FastPrefs_Icon"
+ image_name="Presets_Icon"
left_pad="5"
top="2"
- name="fastprefs_btn"
+ name="presets_icon"
width="18" />
<button
follows="right|top"