Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 texture system"

This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d.

Conflicts:

	linden/indra/newview/llsurface.cpp
	linden/indra/newview/llviewerwindow.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/pipeline.cpp
	linden/indra/newview/pipeline.h

2 files changed, 12 insertions, 62 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
index e85eaa8..24a895b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
@@ -64,35 +64,7 @@
                 tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
                 width="315" />
 
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-                font="SansSerifSmall" h_pad="0" halign="left" height="12"
-                left="10" mouse_opaque="true" name="Enable FBO:" v_pad="0"
-                width="128">
-    Enable FBO:
-  </text>
-  <check_box bottom_delta="-5" control_name="RenderUseFBO" enabled="true" follows="left|top"
-                font="SansSerifSmall" height="16" initial_value="true"
-                label="Enable OpenGL Framebuffer Objects" left="148"
-                mouse_opaque="true" name="fbo" radio_style="false"
-                tool_tip="Enabling this will use OpenGL Framebuffer objects for some dynamic textures.  Prerequisite for deferred rendering."
-                width="315" />
-
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-                font="SansSerifSmall" h_pad="0" halign="left" height="12"
-                left="10" mouse_opaque="true" name="Deferred Rendering:" v_pad="0"
-                width="128">
-     Deferred Rendering:
-  </text>
-  <check_box bottom_delta="-5" control_name="RenderDeferred" enabled="true" follows="left|top"
-                font="SansSerifSmall" height="16" initial_value="true"
-                label="Enable per-pixel lighting and shadows" left="148"
-                mouse_opaque="true" name="deferred" radio_style="false"
-                tool_tip="Enabling this will perform lighting calculations in screen space, enabling per pixel lighting for all lights and shadows from the sun/moon.  Requires a fast graphics card.  Might not be compatible with FSAA."
-                width="315" />
-
-  <slider bottom_delta="-21" can_edit_text="false" control_name="TextureMemory" 
+        <slider bottom_delta="-21" can_edit_text="false" control_name="TextureMemory" 
                 decimal_digits="0" enabled="true"
                 follows="left|top" height="16" increment="16"
                 initial_val="32" label="Texture Memory (MB):" label_width="135" left="10"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 1be2e58..0cb4a59 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -1036,47 +1036,25 @@
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-21" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
-                             mouse_opaque="true" name="label color" v_pad="0" width="57">
+                             mouse_opaque="true" name="label color" v_pad="0" width="58">
         Color:
       </text>
                         <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-28"
                              can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-                             height="48" label="" left_delta="57" mouse_opaque="true" name="colorswatch"
+                             height="48" label="" left_delta="67" mouse_opaque="true" name="colorswatch"
                              tool_tip="Click to open Color Picker" width="32" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="28" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" height="10" left="144"
-                             mouse_opaque="true" name="label texture" v_pad="0" width="58">
-                             Texture
-                       </text>
-                       <texture_picker allow_no_texture="true" bottom_delta="-28" can_apply_immediately="true"
-                                default_image_name="Default" follows="left|top" height="48" label=""
-                                left_delta="57" mouse_opaque="true" name="light texture control"
-                                tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)" width="32" />
                         <spinner bottom_delta="-4" decimal_digits="3" follows="left|top" height="16"
-                                increment="0.1" initial_val="0.5" label="Intensity:" label_width="55"
-                                left="10" max_val="1" min_val="0" mouse_opaque="true"
-                                name="Light Intensity" width="120" />
-                        <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-                                increment="0.1" initial_val="0.5" label="FOV" label_width="55"
-                                left="144" max_val="3" min_val="0" mouse_opaque="true"
-                                name="Light FOV" width="120" />
+                             increment="0.1" initial_val="0.5" label="Intensity:" label_width="65"
+                             left="10" max_val="1" min_val="0" mouse_opaque="true"
+                             name="Light Intensity" width="128" />
                         <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                                increment="0.1" initial_val="5" label="Radius" label_width="55"
-                                left="10" max_val="20" min_val="0" mouse_opaque="true"
-                                name="Light Radius" width="120" />
-                        <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-                                increment="0.5" initial_val="0.5" label="Focus" label_width="55"
-                                left="144" max_val="20" min_val="-20" mouse_opaque="true"
-                                name="Light Focus" width="120" />
+                             increment="0.1" initial_val="5" label="Radius:" label_width="65"
+                             left_delta="0" max_val="20" min_val="0" mouse_opaque="true"
+                             name="Light Radius" width="128" />
                         <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                                increment="0.25" initial_val="1" label="Falloff" label_width="55"
-                                left="10" max_val="2" min_val="0" mouse_opaque="true"
-                                name="Light Falloff" width="120" />
-                        <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-                                increment="0.05" initial_val="1" label="Ambiance" label_width="55"
-                                left="144" max_val="1" min_val="0" mouse_opaque="true"
-                                name="Light Ambiance" width="120" />
+                             increment="0.25" initial_val="1" label="Falloff:" label_width="65"
+                             left_delta="0" max_val="2" min_val="0" mouse_opaque="true"
+                             name="Light Falloff" width="128" />
                 </panel>
 
 <!-- Texture sub-tab -->