diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp
index 30d470729f1f12a6199051e53bbccacf7ad4ead5..bd05f05751ade6bc861ab90904432a8ad237c4f3 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
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index 7795397803712510825bdf0a8f6d5dc986cd77e5..e09bc028ce879799ba07a81b90ba8c77dd6a19d2 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -248,7 +248,7 @@ void LLFloaterPathfindingConsole::onClose(bool pIsAppQuitting)
 	{
 		mAgentStateSlot.disconnect();
 	}
-
+	LLPathingLib::getInstance()->cleanupResidual();
 	LLFloater::onClose(pIsAppQuitting);
 }