summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorprep <none@none>2012-02-24 13:16:35 -0500
committerprep <none@none>2012-02-24 13:16:35 -0500
commitb7d93d8adf9f604a2f345336bd0e37c08a0d10cb (patch)
tree98ac371a36c13cb5fa89e99799b2f929ff7abd41 /indra/llrender
parent11bc6e9780d741cdd9405a1dcbe6b6dfb728c15a (diff)
Path-267: Add support for rendering of walkable objects, obstacles and material phantoms.
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llrendernavprim.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp
index 30d470729f..bd05f05751 100644
--- a/indra/llrender/llrendernavprim.cpp
+++ b/indra/llrender/llrendernavprim.cpp
@@ -87,8 +87,7 @@ void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const L
//=============================================================================
void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
{
- LLGLSUIDefault gls_ui;
- LLGLEnable depth( GL_DEPTH_TEST );
+ LLGLEnable blend( GL_BLEND );
LLGLEnable cull( GL_CULL_FACE );
glLineWidth(1.5f);
LLGLSLShader::sNoFixedFunction = false;
@@ -96,13 +95,13 @@ void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
pVBO->setBuffer( LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_NORMAL );
pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
- LLGLEnable smooth(GL_LINE_SMOOTH);
+ LLGLEnable smooth( GL_LINE_SMOOTH );
//pass 2 outlined
pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
LLGLSLShader::sNoFixedFunction = true;
glLineWidth(1.0f);
glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
- LLGLDisable smoothout(GL_LINE_SMOOTH);
+ LLGLDisable smoothout( GL_LINE_SMOOTH );
}
//=============================================================================
void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, int color ) const