From 10599b5e8c776a45bc0f14e8fd3f70e0f81196f2 Mon Sep 17 00:00:00 2001 From: prep Date: Wed, 14 Dec 2011 11:25:30 -0500 Subject: merge --- indra/llrender/llrendernavprim.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llrender') diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp index c07d93ab0a..5c7a669fd2 100644 --- a/indra/llrender/llrendernavprim.cpp +++ b/indra/llrender/llrendernavprim.cpp @@ -56,7 +56,7 @@ void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const L glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); LLGLDisable cull(GL_CULL_FACE); LLColor4 colorA( color ); - //colorA*=2.0f; + colorA*=1.5f; gGL.color4fv( colorA.mV ); gGL.begin(LLRender::TRIANGLES); @@ -75,7 +75,7 @@ void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ) glLineWidth(1.5f); glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); LLGLDisable cull(GL_CULL_FACE); - gGL.color4fv( LLColor4::white.mV ); pVBO->setBuffer( LLVertexBuffer::MAP_VERTEX ); + pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt ); } //============================================================================= -- cgit v1.2.3