summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authoreli <none@none>2012-12-12 17:01:38 -0800
committereli <none@none>2012-12-12 17:01:38 -0800
commit739437e56282a04260af0ffad536e4f037a4e3a8 (patch)
tree242f1969459ad1f6a18e4dff60252a382c9f3280 /indra/newview
parentbf28ce0eea86e4be1de47da83f4855aafe72688a (diff)
sync with viewer-development
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml43
1 files changed, 35 insertions, 8 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 f7666bdc4c..849f3ef73d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -55,30 +55,57 @@
name="LowGraphicsDivet"
top_delta="-2"
width="2" />
+ <icon
+ color="0.12 0.12 0.12 1"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="LowMidraphicsDivet"
+ top_delta="-2"
+ width="2" />
<icon
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="83"
+ left_pad="41"
name="MidGraphicsDivet"
top_delta="0"
width="2" />
+ <icon
+ color="0.12 0.12 0.12 1"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="MidHighGraphicsDivet"
+ top_delta="0"
+ width="2" />
<icon
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="85"
+ left_pad="41"
name="HighGraphicsDivet"
top_delta="0"
width="2" />
+ <icon
+ color="0.12 0.12 0.12 1"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="HighUltraGraphicsDivet"
+ top_delta="0"
+ width="2" />
<icon
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="83"
+ left_pad="41"
name="UltraGraphicsDivet"
top_delta="0"
width="2" />
@@ -91,7 +118,7 @@
initial_value="0"
layout="topleft"
left="120"
- max_val="3"
+ max_val="6"
name="QualityPerformanceSelection"
show_text="false"
top_delta="-2"
@@ -120,12 +147,12 @@
height="12"
layout="topleft"
left_delta="87"
- name="ShadersPrefText2"
+ name="ShadersPrefText3"
top_delta="0"
width="80">
Mid
</text>
- <text
+ <text
type="string"
length="1"
follows="left|top"
@@ -136,8 +163,8 @@
name="ShadersPrefText3"
top_delta="0"
width="80">
- High
- </text>
+ High
+ </text>
<text
type="string"
length="1"