summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorcallum_linden <none@none>2013-05-06 19:45:23 -0700
committercallum_linden <none@none>2013-05-06 19:45:23 -0700
commit1e7b133e75c2c93290db6b0c9db721e95849ff30 (patch)
tree0a329819a22244fb84a0f25d2f3e9c04f0d3dd29 /indra/newview/skins/default/xui/en
parent90d3045c7f693f599dac64c1845ddc639150fe1e (diff)
parent9609fa72594dd71f8be6417b5a889cfac7112cfd (diff)
Merge with lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml23
1 files changed, 13 insertions, 10 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 708dcf4e95..d7db7caf66 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -211,16 +211,19 @@
name="TransparentWater"
top_pad="7"
width="256" />
- <check_box
- control_name="RenderObjectBump"
- height="16"
- initial_value="true"
- label="Bump mapping and shiny"
- layout="topleft"
- left_delta="0"
- name="BumpShiny"
- top_pad="1"
- width="256" />
+ <check_box
+ control_name="RenderObjectBump"
+ height="16"
+ initial_value="true"
+ label="Bump mapping and shiny"
+ layout="topleft"
+ left_delta="0"
+ name="BumpShiny"
+ top_pad="1"
+ width="256">
+ <check_box.commit_callback
+ function="Pref.VertexShaderEnable" />
+ </check_box>
<check_box
control_name="RenderLocalLights"
height="16"