summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-10-02 02:12:21 -0500
committerDave Parks <davep@lindenlab.com>2011-10-02 02:12:21 -0500
commitac37656aa5ff545c90fadfd5b585cb823ad68b0d (patch)
tree71af4561c22d90bf40ba54ba97b1350467f73e75 /indra/newview/skins/default/xui
parent784fed2ebb3efd8e4da132c291aaf16cdb931b98 (diff)
SH-2276 Fix for failed assertions reported from debug-enabled viewers. Also, remove "Basic Shaders" as a user settable option (shaders are always on if GL version >= 2.0, always off otherwise)
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml14
1 files changed, 0 insertions, 14 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..c25c1f23f5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -204,20 +204,6 @@
name="LocalLights"
top_pad="1"
width="256" />
- <check_box
- control_name="VertexShaderEnable"
- height="16"
- initial_value="true"
- label="Basic shaders"
- layout="topleft"
- left_delta="0"
- name="BasicShaders"
- tool_tip="Disabling this option may prevent some graphics card drivers from crashing"
- top_pad="1"
- width="315">
- <check_box.commit_callback
- function="Pref.VertexShaderEnable" />
- </check_box>
<check_box
control_name="WindLightUseAtmosShaders"
height="16"