From 31e7c77a411d94bc87f0232588b339149bb29a49 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 28 Sep 2008 17:21:23 -0500
Subject: Second Life viewer sources 1.21.3-RC

---
 linden/indra/newview/llface.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/llface.cpp')

diff --git a/linden/indra/newview/llface.cpp b/linden/indra/newview/llface.cpp
index 9a74446..5b43fcd 100644
--- a/linden/indra/newview/llface.cpp
+++ b/linden/indra/newview/llface.cpp
@@ -419,8 +419,6 @@ void LLFace::renderSelected(LLImageGL *imagep, const LLColor4& color)
 
 	if (mGeomCount > 0 && mIndicesCount > 0)
 	{
-		gGL.color4fv(color.mV);
-
 		LLViewerImage::bindTexture(imagep);
 	
 		gGL.pushMatrix();
@@ -433,12 +431,16 @@ void LLFace::renderSelected(LLImageGL *imagep, const LLColor4& color)
 			glMultMatrixf((GLfloat*)mDrawablep->getRegion()->mRenderMatrix.mMatrix);
 		}
 
+		setFaceColor(color);
+		renderSetColor();
+
 		mVertexBuffer->setBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD);
 #if !LL_RELEASE_FOR_DOWNLOAD
 		LLGLState::checkClientArrays("", LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD);
 #endif
 		mVertexBuffer->draw(LLVertexBuffer::TRIANGLES, mIndicesCount, mIndicesIndex);
 				
+		unsetFaceColor();
 		gGL.popMatrix();
 	}
 }
-- 
cgit v1.1