summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-03 16:36:51 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-03 16:36:51 -0500
commitc29203f3f33184b05676db413f936eaff41eab74 (patch)
treeed167dd731453ecd1b31f2d4290809e215768c01 /indra/newview/skins/default/xui/en
parentf79615caced2cebb8e71b388b0dea45776b2f24b (diff)
Fix for clobbered deferred rendering UI.
Fix for compile errors from llappviewer.cpp merge.
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml15
1 files changed, 12 insertions, 3 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 6573822d1a..d5bec66be2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -192,9 +192,19 @@
layout="topleft"
left_delta="0"
name="BumpShiny"
+ width="256" />
+ <check_box
+ control_name="RenderLocalLights"
+ height="16"
+ initial_value="true"
+ label="Local Lights"
+ layout="topleft"
+ left_delta="0"
+ name="LocalLights"
top_pad="1"
width="256" />
- <check_box
+ width="256" />
+ <check_box
control_name="VertexShaderEnable"
height="16"
initial_value="true"
@@ -221,7 +231,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"
@@ -283,7 +292,7 @@
name="2"
value="2"/>
</combo_box>
--->
+
<text
type="string"
length="1"