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

diff --git a/linden/indra/newview/llviewerjointmesh.cpp b/linden/indra/newview/llviewerjointmesh.cpp
index b6f0daf..dc08bcd 100644
--- a/linden/indra/newview/llviewerjointmesh.cpp
+++ b/linden/indra/newview/llviewerjointmesh.cpp
@@ -523,9 +523,9 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy)
         //----------------------------------------------------------------
         if (!gRenderForSelect)
         {
-                if (is_dummy)
+        /*      if (is_dummy)
                         glColor4fv(LLVOAvatar::getDummyColor().mV);
-                else
+                else */
                         glColor4fv(mColor.mV);
         }
 
@@ -557,7 +557,7 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy)
         {
                 if(     mLayerSet->hasComposite() )
                 {
-                        gGL.getTexUnit(0)->bind(mLayerSet->getComposite()->getTexture());
+                        gGL.getTexUnit(0)->bind(mLayerSet->getComposite()->getTexture(), TRUE); // KL SD
                 }
                 else
                 {
@@ -565,7 +565,7 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy)
                         // Ignore the warning if that's the case.
                         if (!gSavedSettings.getBOOL("RenderUnloadedAvatar"))
                         {
-                                llwarns << "Layerset without composite" << llendl;
+                                //llwarns << "Layerset without composite" << llendl;
                         }
                         gGL.getTexUnit(0)->bind(gImageList.getImage(IMG_DEFAULT));
                 }
@@ -574,7 +574,7 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy)
         if ( !is_dummy && mTexture.notNull() )
         {
                 old_mode = mTexture->getAddressMode();
-                gGL.getTexUnit(0)->bind(mTexture.get());
+                gGL.getTexUnit(0)->bind(mTexture.get(), TRUE); // KL SD
                 gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
         }
         else