summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-08-31 18:10:02 -0500
committerDave Parks <davep@lindenlab.com>2010-08-31 18:10:02 -0500
commit1c286f6b0bc3ab3fe02d2ce3cdd80d09f6809c0e (patch)
treeab0003a2781a85558b8741e78df249d3ba439154 /indra/newview/skins/default
parente68f9e566b5aeb5341f5adea0b8a6ccde86ee93d (diff)
Merge cleanup.
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml1
1 files changed, 0 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 3915b7ef4c..eb9c12be4f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -211,7 +211,6 @@
<check_box.commit_callback
function="Pref.VertexShaderEnable" />
</check_box>
-<!-- DISABLED UNTIL WE REALLY WANT TO SUPPORT THIS
<check_box
control_name="RenderDeferred"
height="16"