summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml80
1 files changed, 43 insertions, 37 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 e38ad01ff9..e6e7094847 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -242,12 +242,15 @@
control_name="RenderDeferred"
height="16"
initial_value="true"
- label="Lighting Shaders"
+ label="Lighting and Shadows"
layout="topleft"
left_delta="0"
name="UseLightShaders"
top_pad="1"
- width="256"/>
+ width="256">
+ <check_box.commit_callback
+ function="Pref.VertexShaderEnable" />
+ </check_box>
<check_box
control_name="RenderDeferredSSAO"
height="16"
@@ -257,9 +260,12 @@
left_delta="0"
name="UseSSAO"
top_pad="1"
- width="256"/>
+ width="256">
+ <check_box.commit_callback
+ function="Pref.VertexShaderEnable" />
+ </check_box>
- <text
+ <text
type="string"
length="1"
top_pad="8"
@@ -269,72 +275,72 @@
word_wrap="true"
layout="topleft"
left="10"
- name="reflection_label">
- Water Reflections:
+ name="shadows_label">
+ Shadows:
</text>
<combo_box
- control_name="RenderReflectionDetail"
+ control_name="RenderShadowDetail"
height="23"
layout="topleft"
- left_="10"
- top_pad ="0"
- name="Reflections"
+ left="10"
+ top_pad="0"
+ name="ShadowDetail"
width="150">
<combo_box.item
label="None"
name="0"
value="0"/>
<combo_box.item
- label="Terrain and trees"
+ label="Sun/Moon"
name="1"
value="1"/>
<combo_box.item
- label="All static objects"
+ label="Sun/Moon + Projectors"
name="2"
value="2"/>
- <combo_box.item
- label="All avatars and objects"
- name="3"
- value="3"/>
- <combo_box.item
- label="Everything"
- name="4"
- value="4"/>
</combo_box>
<text
- type="string"
- length="1"
- top_pad="8"
- follows="top|left"
- height="23"
- width="110"
- word_wrap="true"
- layout="topleft"
- left="10"
- name="shadows_label">
- Shadows:
+ type="string"
+ length="1"
+ top_pad="8"
+ follows="top|left"
+ height="23"
+ width="110"
+ word_wrap="true"
+ layout="topleft"
+ left="10"
+ name="reflection_label">
+ Water Reflections:
</text>
<combo_box
- control_name="RenderShadowDetail"
+ control_name="RenderReflectionDetail"
height="23"
layout="topleft"
- left="10"
- top_pad="0"
- name="ShadowDetailRadio"
+ left_="10"
+ top_pad ="0"
+ name="Reflections"
width="150">
<combo_box.item
label="None"
name="0"
value="0"/>
<combo_box.item
- label="Sun/Moon"
+ label="Terrain and trees"
name="1"
value="1"/>
<combo_box.item
- label="Sun/Moon + Projectors"
+ label="All static objects"
name="2"
value="2"/>
+ <combo_box.item
+ label="All avatars and objects"
+ name="3"
+ value="3"/>
+ <combo_box.item
+ label="Everything"
+ name="4"
+ value="4"/>
</combo_box>
<slider