From 0908b60c1cfde9a7cfb131fb0690bd21f8943a57 Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Fri, 1 Feb 2013 08:10:16 +0000
Subject: STORM-1930 Quality & Speed slider has Ultra label where High should
 be.

---
 doc/contributions.txt                                     |  1 +
 .../skins/default/xui/en/panel_preferences_graphics1.xml  | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 10d6818bd3..e86ef11a72 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1251,6 +1251,7 @@ Whimsy Winx
 Whirly Fizzle
 	STORM-1895
 	MAINT-873
+	STORM-1930
 Whoops Babii
 	VWR-631
 	VWR-1640
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 7eb0fac2be..cd243d40a4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -147,11 +147,24 @@
      height="12"
      layout="topleft"
      left_delta="87"
-     name="ShadersPrefText3"
+     name="ShadersPrefText2"
      top_delta="0"
      width="80">
         Mid
     </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     halign="center"
+     height="12"
+     layout="topleft"
+     left_delta="87"
+     name="ShadersPrefText3"
+     top_delta="0"
+     width="80">
+        High
+    </text>
     <text
      type="string"
      length="1"
-- 
cgit v1.2.3


From 702332fc02a57d099dd4fb7465e778a017d666da Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 5 Feb 2013 12:30:30 -0500
Subject: tag merge of DRTVWR-296

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d220aa6855..40a7a7e267 100644
--- a/.hgtags
+++ b/.hgtags
@@ -412,3 +412,4 @@ a676b4d6c037b39fe5b8e42cf8839a9303936089 DRTVWR-289
 28fa8b944a0c1869636ab00cc400f5aa71f6fa3c DRTVWR-290
 7f09bbc28c297f14b67961be7b6575445fa160e8 DRTVWR-291
 b23419a2748483c98f3b84b630468a21c88feba5 DRTVWR-292
+1cce8447f8f574673e3f47d6fe584262e6964fe2 DRTVWR-296
-- 
cgit v1.2.3