From 1ad4597d7a19e841638d59074aa079b54af2873f Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Mon, 23 Jul 2012 12:00:33 +0200
Subject: [PATCH] Fix alpha flicker when Show Updates is enabled

---
 indra/newview/llvovolume.cpp | 2 +-
 indra/newview/pipeline.cpp   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index a72733f91..b785f22f5 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2390,7 +2390,7 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const
 		produces_light = 1;
 	}
 
-	for (S32 i = 0; i < num_faces; ++i)
+	for (U32 i = 0; i < num_faces; ++i)
 	{
 		const LLFace* face = drawablep->getFace(i);
 		if (!face) continue;
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index d5f4d1561..f2b0642e1 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4251,6 +4251,12 @@ void LLPipeline::renderDebug()
 		gGL.end();
 		gGL.flush();
 		glPointSize(1.f);
+
+		if (LLGLSLShader::sNoFixedFunction)
+		{
+			gUIProgram.unbind();
+		}
+
 	}
 
 	if(!mRenderDebugMask)