Updated source to SL version 1.21.6.

1 files changed, 4 insertions, 2 deletions

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();
         }
 }