From 6d6c38f21688eb99691a8273e0779c50dfa69db7 Mon Sep 17 00:00:00 2001
From: prep <none@none>
Date: Mon, 13 Feb 2012 10:10:57 -0500
Subject: Path-197. Navmeshes are converted into vbos.

---
 indra/llrender/llrendernavprim.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/llrender')

diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp
index 71e808d04e..b99a8cdc86 100644
--- a/indra/llrender/llrendernavprim.cpp
+++ b/indra/llrender/llrendernavprim.cpp
@@ -38,6 +38,7 @@ LLRenderNavPrim gRenderNav;
 void LLRenderNavPrim::renderSegment( const LLVector3& start, const LLVector3& end, int color, bool overlayMode  ) const
 {	
 	LLGLSLShader::sNoFixedFunction = false;
+	LLGLEnable smooth(GL_LINE_SMOOTH);
 	LLColor4 colorA( color );	
 	glLineWidth(1.5f);	
 	gGL.color3fv( colorA.mV );
@@ -51,6 +52,7 @@ void LLRenderNavPrim::renderSegment( const LLVector3& start, const LLVector3& en
 
 	gGL.flush();
 	LLGLSLShader::sNoFixedFunction = true;
+	LLGLDisable smoothout(GL_LINE_SMOOTH);
 	glLineWidth(1.0f);	
 }
 //=============================================================================
@@ -86,7 +88,7 @@ void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const L
 void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
 {
 	LLGLSUIDefault gls_ui;
-	glEnable( GL_DEPTH_TEST );                        
+	LLGLEnable depth( GL_DEPTH_TEST );                        
 	LLGLEnable cull( GL_CULL_FACE );		
 	glLineWidth(1.5f);		
 	LLGLSLShader::sNoFixedFunction = false;
@@ -94,11 +96,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);
 	//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);
 }
 //=============================================================================
 void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, int color ) const
-- 
cgit v1.2.3