summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-02-05 14:11:04 -0500
committerOz Linden <oz@lindenlab.com>2013-02-05 14:11:04 -0500
commit8b8142c04e63349df51e8314b4809b464fe4da6d (patch)
tree1927422c4c7eb32c89d920fee924e038ab3ea3a7 /indra/newview/skins
parente7c0f69c8e0509d822c6f7410bc0d5bb10fde522 (diff)
parent79eeae502c4965a6091614f774aa68ba7837742a (diff)
merge changes for 3.4.5-beta5
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"