aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llface.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llface.cpp6
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)
419 419
420 if (mGeomCount > 0 && mIndicesCount > 0) 420 if (mGeomCount > 0 && mIndicesCount > 0)
421 { 421 {
422 gGL.color4fv(color.mV);
423
424 LLViewerImage::bindTexture(imagep); 422 LLViewerImage::bindTexture(imagep);
425 423
426 gGL.pushMatrix(); 424 gGL.pushMatrix();
@@ -433,12 +431,16 @@ void LLFace::renderSelected(LLImageGL *imagep, const LLColor4& color)
433 glMultMatrixf((GLfloat*)mDrawablep->getRegion()->mRenderMatrix.mMatrix); 431 glMultMatrixf((GLfloat*)mDrawablep->getRegion()->mRenderMatrix.mMatrix);
434 } 432 }
435 433
434 setFaceColor(color);
435 renderSetColor();
436
436 mVertexBuffer->setBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD); 437 mVertexBuffer->setBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD);
437#if !LL_RELEASE_FOR_DOWNLOAD 438#if !LL_RELEASE_FOR_DOWNLOAD
438 LLGLState::checkClientArrays("", LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD); 439 LLGLState::checkClientArrays("", LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD);
439#endif 440#endif
440 mVertexBuffer->draw(LLVertexBuffer::TRIANGLES, mIndicesCount, mIndicesIndex); 441 mVertexBuffer->draw(LLVertexBuffer::TRIANGLES, mIndicesCount, mIndicesIndex);
441 442
443 unsetFaceColor();
442 gGL.popMatrix(); 444 gGL.popMatrix();
443 } 445 }
444} 446}