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, 30 insertions, 7 deletions

diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index cbd0472..bd5abe2 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -34,7 +34,7 @@
 
 #include "llviewerobject.h"
 
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "imageids.h"
 #include "indra_constants.h"
 #include "llmath.h"
@@ -2787,6 +2787,11 @@ BOOL LLViewerObject::updateGeometry(LLDrawable *drawable)
         return TRUE;
 }
 
+void LLViewerObject::updateGL()
+{
+
+}
+
 void LLViewerObject::updateFaceSize(S32 idx)
 {
         
@@ -2891,7 +2896,7 @@ F32 LLViewerObject::getMidScale() const
 }
 
 
-void LLViewerObject::updateTextures()
+void LLViewerObject::updateTextures(LLAgent &agent)
 {
 }
 
@@ -3736,6 +3741,7 @@ S32 LLViewerObject::setTEColor(const U8 te, const LLColor4& color)
         else if (color != tep->getColor())
         {
                 retval = LLPrimitive::setTEColor(te, color);
+                //setChanged(TEXTURE);
                 if (mDrawable.notNull() && retval)
                 {
                         // These should only happen on updates which are not the initial update.
@@ -3974,7 +3980,7 @@ LLViewerImage *LLViewerObject::getTEImage(const U8 face) const
                 }
         }
 
-        llerrs << llformat("Requested Image from invalid face: %d/%d",face,getNumTEs()) << llendl;
+        llwarns << llformat("Requested Image from invalid face: %d/%d",face,getNumTEs()) << llendl;
 
         return NULL;
 }
@@ -4160,6 +4166,11 @@ void LLViewerObject::updateText()
         }
 }
 
+LLVOAvatar* LLViewerObject::asAvatar()
+{
+        return NULL;
+}
+
 BOOL LLViewerObject::isParticleSource() const
 {
         return !mPartSourcep.isNull() && !mPartSourcep->isDead();
@@ -4374,7 +4385,14 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow
                 gAudiop->cleanupAudioSource(mAudioSourcep);
                 mAudioSourcep = NULL;
         }
-
+/*
+        if (mAudioSourcep && mAudioSourcep->isMuted() &&
+            mAudioSourcep->getCurrentData() && mAudioSourcep->getCurrentData()->getID() == audio_uuid)
+        {
+                //llinfos << "Already having this sound as muted sound, ignoring" << llendl;
+                return;
+        }
+*/
         getAudioSource(owner_id);
 
         if (mAudioSourcep)
@@ -4468,7 +4486,11 @@ LLViewerObject::ExtraParameter* LLViewerObject::createNewParameterEntry(U16 para
                   new_block = new LLSculptParams();
                   break;
           }
-
+          case LLNetworkData::PARAMS_LIGHT_IMAGE:
+          {
+                  new_block = new LLLightImageParams();
+                  break;
+          }
           default:
           {
                   llinfos << "Unknown param type." << llendl;
@@ -4559,7 +4581,7 @@ bool LLViewerObject::setParameterEntry(U16 param_type, const LLNetworkData& new_
 bool LLViewerObject::setParameterEntryInUse(U16 param_type, BOOL in_use, bool local_origin)
 {
         ExtraParameter* param = getExtraParameterEntryCreate(param_type);
-        if (param->in_use != in_use)
+        if (param && param->in_use != in_use)
         {
                 param->in_use = in_use;
                 parameterChanged(param_type, param->data, in_use, local_origin);
@@ -4975,7 +4997,7 @@ U32 LLViewerObject::getPartitionType() const
         return LLViewerRegion::PARTITION_NONE; 
 }
 
-void LLViewerObject::dirtySpatialGroup() const
+void LLViewerObject::dirtySpatialGroup(BOOL priority) const
 {
         if (mDrawable)
         {
@@ -4983,6 +5005,7 @@ void LLViewerObject::dirtySpatialGroup() const
                 if (group)
                 {
                         group->dirtyGeom();
+                        gPipeline.markRebuild(group, priority);
                 }
         }
 }