From 98740db8fd5875033d08b6aef6d9bf5c3c49eeee Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Wed, 4 Apr 2007 19:49:24 +0000
Subject: svn merge -r 59826:59968
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/newview/pipeline.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'indra/newview/pipeline.cpp')

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 52ceb481d9..44ebb2503b 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1916,11 +1916,13 @@ void LLPipeline::renderGeom(LLCamera& camera)
 	//
 	//	
 	stop_glerror();
-	BOOL did_hud_elements = FALSE;
+	BOOL did_hud_elements = LLDrawPoolWater::sSkipScreenCopy;
 	BOOL occlude = sUseOcclusion;
 
 	U32 cur_type = 0;
 
+	glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
+
 	if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_PICKING))
 	{
 		gObjectList.renderObjectsForSelect(camera);
@@ -1928,7 +1930,6 @@ void LLPipeline::renderGeom(LLCamera& camera)
 	else
 	{
 		LLFastTimer t(LLFastTimer::FTM_POOLS);
-		glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
 		calcNearbyLights(camera);
 		pool_set_t::iterator iter1 = mPools.begin();
 		while ( iter1 != mPools.end() )
@@ -2002,7 +2003,6 @@ void LLPipeline::renderGeom(LLCamera& camera)
 			iter1 = iter2;
 			stop_glerror();
 		}
-		glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 	}
 
 #ifndef LL_RELEASE_FOR_DOWNLOAD
@@ -2039,6 +2039,8 @@ void LLPipeline::renderGeom(LLCamera& camera)
 	// have touch-handlers.
 	mHighlightFaces.clear();
 
+	glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+
 	if (!hasRenderType(LLPipeline::RENDER_TYPE_HUD) && 
 		!LLDrawPoolWater::sSkipScreenCopy &&
 		sRenderGlow &&
-- 
cgit v1.2.3