Merge branch 'mccabe-plugins' into plugins_merge

Conflicts:
	linden/doc/contributions.txt
	linden/indra/cmake/GStreamer.cmake
	linden/indra/cmake/LLMedia.cmake
	linden/indra/cmake/OPENAL.cmake
	linden/indra/llmedia/CMakeLists.txt
	linden/indra/llprimitive/material_codes.h
	linden/indra/newview/chatbar_as_cmdline.cpp
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/llviewerwindow.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/pipeline.cpp
	linden/indra/newview/pipeline.h
	linden/indra/newview/viewer_manifest.py
	linden/install.xml

1 files changed, 8 insertions, 3 deletions

diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index 33e8da2..a227f2d 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -74,6 +74,7 @@ class LLViewerPartSourceScript;
 class LLViewerRegion;
 class LLViewerObjectMedia;
 class LLVOInventoryListener;
+class LLVOAvatar;
 
 typedef enum e_object_update_type
 {
@@ -116,7 +117,7 @@ public:
 
 //============================================================================
 
-class LLViewerObject : public LLPrimitive, public LLRefCount
+class LLViewerObject : public LLPrimitive, public LLRefCount, public LLGLUpdate
 {
 protected:
         ~LLViewerObject(); // use unref()
@@ -143,6 +144,8 @@ public:
         BOOL isOrphaned() const                                                         { return mOrphaned; }
         BOOL isParticleSource() const;
 
+        virtual LLVOAvatar* asAvatar();
+
         static void initVOClasses();
         static void cleanupVOClasses();
 
@@ -189,11 +192,12 @@ public:
         S32 getNumFaces() const { return mNumFaces; }
 
         // Graphical stuff for objects - maybe broken out into render class later?
-        virtual void updateTextures();
+        virtual void updateTextures(LLAgent &agent);
         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);
@@ -218,6 +222,7 @@ 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.
@@ -468,7 +473,7 @@ public:
 
         virtual S32 getLOD() const { return 3; } 
         virtual U32 getPartitionType() const;
-        virtual void dirtySpatialGroup() const;
+        virtual void dirtySpatialGroup(BOOL priority = FALSE) const;
         virtual void dirtyMesh();
 
         virtual LLNetworkData* getParameterEntry(U16 param_type) const;