From c29203f3f33184b05676db413f936eaff41eab74 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 3 Dec 2010 16:36:51 -0500
Subject: Fix for clobbered deferred rendering UI. Fix for compile errors from
 llappviewer.cpp merge.

---
 .../skins/default/xui/en/panel_preferences_graphics1.xml  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default')

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"
-- 
cgit v1.2.3


From 2bc6e28e0e327ec4f56d005ece9fb6e394013968 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 3 Dec 2010 16:52:23 -0500
Subject: Fix for overlapping UI elements in panel_preferences_graphics1 due to
 bad merge.

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default')

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 d5bec66be2..70db3c6592 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -192,6 +192,7 @@
 		 layout="topleft"
 		 left_delta="0"
 		 name="BumpShiny"
+		 top_pad="1"
 		width="256" />
     <check_box
 		control_name="RenderLocalLights"
-- 
cgit v1.2.3