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, 11 insertions, 4 deletions

diff --git a/linden/indra/newview/lldrawpooltree.cpp b/linden/indra/newview/lldrawpooltree.cpp
index e4560f2..52f669a 100644
--- a/linden/indra/newview/lldrawpooltree.cpp
+++ b/linden/indra/newview/lldrawpooltree.cpp
@@ -52,7 +52,7 @@ LLDrawPoolTree::LLDrawPoolTree(LLViewerImage *texturep) :
         LLFacePool(POOL_TREE),
         mTexturep(texturep)
 {
-        gGL.getTexUnit(0)->bind(mTexturep.get());
+//      gGL.getTexUnit(0)->bind(mTexturep.get());
         mTexturep->setAddressMode(LLTexUnit::TAM_WRAP);
 }
 
@@ -110,7 +110,7 @@ void LLDrawPoolTree::render(S32 pass)
         }
         else
         {
-                gGL.getTexUnit(sDiffTex)->bind(mTexturep);
+                gGL.getTexUnit(sDiffTex)->bind(mTexturep, TRUE);
                                         
                 for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
                          iter != mDrawFace.end(); iter++)
@@ -140,7 +140,7 @@ void LLDrawPoolTree::endRenderPass(S32 pass)
 void LLDrawPoolTree::beginDeferredPass(S32 pass)
 {
         LLFastTimer t(LLFastTimer::FTM_RENDER_TREES);
-        gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f);
+        gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f); // KL Render-pipeline has this set at 0.f ... NOOOOOO! make shitty trees :)
                 
         shader = &gDeferredTreeProgram;
         shader->bind();
@@ -166,6 +166,9 @@ void LLDrawPoolTree::beginShadowPass(S32 pass)
 {
         LLFastTimer t(LLFastTimer::FTM_SHADOW_TREE);
         gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f);
+        glPolygonOffset(gSavedSettings.getF32("RenderDeferredTreeShadowOffset"),
+                                        gSavedSettings.getF32("RenderDeferredTreeShadowBias"));
+
         gDeferredShadowProgram.bind();
 }
 
@@ -178,7 +181,11 @@ void LLDrawPoolTree::endShadowPass(S32 pass)
 {
         LLFastTimer t(LLFastTimer::FTM_SHADOW_TREE);
         gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
-        gDeferredShadowProgram.unbind();
+
+        glPolygonOffset(gSavedSettings.getF32("RenderDeferredSpotShadowOffset"),
+                                                gSavedSettings.getF32("RenderDeferredSpotShadowBias"));
+
+        //gDeferredShadowProgram.unbind();
 }