From 5722c5923cb763a165c50c1d2be426b2e532ea65 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Wed, 28 Mar 2012 14:55:55 -0400
Subject: Fixed blend caps for navmesh tris and updated navmesh face alpha to
 be totally opaque.

---
 indra/newview/app_settings/settings.xml | 2 +-
 indra/newview/pipeline.cpp              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index aac04ae15f..37e4a43449 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13763,7 +13763,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>0</real>
+      <real>255</real>
     </map>	
 
 </map>
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 8a691d3a16..89824d9da6 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4337,6 +4337,7 @@ void LLPipeline::renderDebug()
 			{				
 				glLineWidth(2.0f);	
 				LLGLEnable cull(GL_CULL_FACE);
+				LLGLEnable blend(GL_BLEND);
 				if ( pathfindingConsole->isRenderWorld() )
 				{					
 					glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );	
@@ -4371,6 +4372,7 @@ void LLPipeline::renderDebug()
 			//User designated path
 			if ( pathfindingConsole->isRenderPath() )
 			{
+				LLGLEnable blend(GL_BLEND);
 				llPathingLibInstance->renderPath();
 			}
 		}
-- 
cgit v1.2.3