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

1 files changed, 0 insertions, 5 deletions

diff --git a/linden/indra/newview/llpanelvolume.h b/linden/indra/newview/llpanelvolume.h
index 5d206fc..841880b 100644
--- a/linden/indra/newview/llpanelvolume.h
+++ b/linden/indra/newview/llpanelvolume.h
@@ -74,10 +74,6 @@ public:
         static void             onLightCancelColor(LLUICtrl* ctrl, void* userdata);
         static void             onLightSelectColor(LLUICtrl* ctrl, void* userdata);
 
-        static void             onLightCancelTexture(LLUICtrl* ctrl, void* userdata);
-        static void             onLightSelectTexture(LLUICtrl* ctrl, void* userdata);
-
-
 protected:
         void                    getState();
 
@@ -103,7 +99,6 @@ protected:
 */
 
         LLColor4                mLightSavedColor;
-        LLUUID                  mLightSavedTexture;
         LLPointer<LLViewerObject> mObject;
         LLPointer<LLViewerObject> mRootObject;
 };