summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorJonathan Yap <jhwelch@gmail.com>2014-12-09 16:48:00 -0500
committerJonathan Yap <jhwelch@gmail.com>2014-12-09 16:48:00 -0500
commit47282ceb7e8b8083cf816dd26bd4907aba313959 (patch)
tree9a74d988f638915049dd3b20593c2eb39c631db4 /indra/newview/skins/default
parent5be238b127ff30f09105ad6f0d9b8ee3dec8b40f (diff)
STORM-2082 Improve file error handling, add help topic labels to new floaters.
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_save_pref_preset.xml2
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_preferences_graphics1.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_presets_pulldown.xml4
4 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
index 03c5a412b6..bdb6481b52 100644
--- a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
@@ -2,7 +2,7 @@
<floater
legacy_header_height="18"
height="130"
- help_topic=""
+ help_topic="floater_delete_pref"
layout="topleft"
name="Delete Pref Preset"
save_rect="true"
diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
index 5919d9e3d7..945ed4d28d 100644
--- a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
@@ -2,7 +2,7 @@
<floater
legacy_header_height="18"
height="130"
- help_topic=""
+ help_topic="floater_save_pref"
layout="topleft"
name="Save Pref Preset"
save_rect="true"
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 24f3dd803f..d0a5075dc8 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -954,7 +954,7 @@
left="10"
name="Defaults"
top="310"
- width="115">
+ width="200">
<button.commit_callback
function="Pref.HardwareDefaults" />
</button>
diff --git a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
index fdcbce05d2..b87dda2315 100644
--- a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
@@ -2,8 +2,8 @@
<panel
background_opaque="true"
background_visible="true"
- bg_opaque_image="Volume_Background"
- bg_alpha_image="Volume_Background"
+ bg_opaque_image="Volume_Background"
+ bg_alpha_image="Volume_Background"
border_visible="false"
border="false"
chrome="true"