summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2011-12-14 11:25:30 -0500
committerprep <prep@lindenlab.com>2011-12-14 11:25:30 -0500
commit10599b5e8c776a45bc0f14e8fd3f70e0f81196f2 (patch)
tree3755e5fddd275afe657faeab02e994700db9fc7f
parent9fd7475e5c0799d654548c8936982c09bb5ec6b3 (diff)
merge
-rw-r--r--indra/llrender/llrendernavprim.cpp4
1 files changed, 2 insertions, 2 deletions
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 );
}
//=============================================================================