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, 3 insertions, 8 deletions

diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index a227f2d..33e8da2 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -74,7 +74,6 @@ class LLViewerPartSourceScript;
 class LLViewerRegion;
 class LLViewerObjectMedia;
 class LLVOInventoryListener;
-class LLVOAvatar;
 
 typedef enum e_object_update_type
 {
@@ -117,7 +116,7 @@ public:
 
 //============================================================================
 
-class LLViewerObject : public LLPrimitive, public LLRefCount, public LLGLUpdate
+class LLViewerObject : public LLPrimitive, public LLRefCount
 {
 protected:
         ~LLViewerObject(); // use unref()
@@ -144,8 +143,6 @@ public:
         BOOL isOrphaned() const                                                         { return mOrphaned; }
         BOOL isParticleSource() const;
 
-        virtual LLVOAvatar* asAvatar();
-
         static void initVOClasses();
         static void cleanupVOClasses();
 
@@ -192,12 +189,11 @@ public:
         S32 getNumFaces() const { return mNumFaces; }
 
         // Graphical stuff for objects - maybe broken out into render class later?
-        virtual void updateTextures(LLAgent &agent);
+        virtual void updateTextures();
         virtual void boostTexturePriority(BOOL boost_children = TRUE);  // When you just want to boost priority of this object
         
         virtual LLDrawable* createDrawable(LLPipeline *pipeline);
         virtual BOOL            updateGeometry(LLDrawable *drawable);
-        virtual void            updateGL();
         virtual void            updateFaceSize(S32 idx);
         virtual BOOL            updateLOD();
         virtual BOOL            setDrawableParent(LLDrawable* parentp);
@@ -222,7 +218,6 @@ public:
 
         virtual BOOL isFlexible() const                                 { return FALSE; }
         virtual BOOL isSculpted() const                                 { return FALSE; }
-        virtual BOOL hasLightTexture() const                    { return FALSE; }
 
         // This method returns true if the object is over land owned by
         // the agent.
@@ -473,7 +468,7 @@ public:
 
         virtual S32 getLOD() const { return 3; } 
         virtual U32 getPartitionType() const;
-        virtual void dirtySpatialGroup(BOOL priority = FALSE) const;
+        virtual void dirtySpatialGroup() const;
         virtual void dirtyMesh();
 
         virtual LLNetworkData* getParameterEntry(U16 param_type) const;