summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorcallum_linden <none@none>2013-02-15 10:15:58 -0800
committercallum_linden <none@none>2013-02-15 10:15:58 -0800
commit010c87788d5c698d6cfe5782ac02d9a3924124cf (patch)
tree345c2b3a26dc76bddcb6864350b8a4eed90d1d92 /indra/newview/skins
parentbfffedaec973948a35ad046769add4fc5ae6e2a1 (diff)
parent8d4b0b9246b66e9e6a94b300693b164585a6acfb (diff)
Merge with HEAD
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml15
1 files changed, 14 insertions, 1 deletions
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,7 +147,7 @@
height="12"
layout="topleft"
left_delta="87"
- name="ShadersPrefText3"
+ name="ShadersPrefText2"
top_delta="0"
width="80">
Mid
@@ -159,6 +159,19 @@
halign="center"
height="12"
layout="topleft"
+ left_delta="87"
+ name="ShadersPrefText3"
+ top_delta="0"
+ width="80">
+ High
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ halign="center"
+ height="12"
+ layout="topleft"
left_delta="85"
name="ShadersPrefText4"
top_delta="0"