summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorJonathan Yap <jhwelch@gmail.com>2014-12-02 07:42:32 -0500
committerJonathan Yap <jhwelch@gmail.com>2014-12-02 07:42:32 -0500
commitade3953e380d9211ad6d332b9b27fa23e57a7d81 (patch)
tree2768ed9c87b68beca036ca5b54a1b016988f3550 /indra/newview/skins/default
parent77b9793c2eb357184aedee85000c90c4b1c3e574 (diff)
STORM-2082 Add Recommended button
Diffstat (limited to 'indra/newview/skins/default')
-rwxr-xr-xindra/newview/skins/default/xui/en/notifications.xml4
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_preferences_graphics1.xml14
2 files changed, 15 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 83370dbba0..1618ea0ec7 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7661,14 +7661,14 @@ Attachment has been saved.
icon="notifytip.tga"
name="PresetSaved"
type="notifytip">
-[TYPE] preset [NAME] has been saved.
+Preset [NAME] has been saved.
</notification>
<notification
icon="notifytip.tga"
name="PresetDeleted"
type="notifytip">
-[TYPE] preset [NAME] has been deleted.
+Preset [NAME] has been deleted.
</notification>
<notification
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 4248de4d96..837644ed27 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -972,12 +972,24 @@
function="Pref.HardwareDefaults" />
</button>
<button
+ follows="left|bottom"
+ height="23"
+ label="Recommended"
+ layout="topleft"
+ left_pad="5"
+ name="Recommended"
+ top="310"
+ width="115">
+ <button.commit_callback
+ function="Pref.Recommended" />
+ </button>
+ <button
follows="right|bottom"
height="23"
label="Hardware..."
label_selected="Hardware"
layout="topleft"
- left_pad="150"
+ left_pad="25"
name="GraphicsHardwareButton"
top="310"
width="115">