From 669addd719fea9376dde00b2c2b22562aa8d8b78 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 5 Apr 2012 00:28:04 -0500
Subject: Fix for: assert when rendering paths, wireframe world when navmesh
 render disabled, heat map breaking walkables etc, and navmesh edges being
 offset from navmesh

---
 autobuild.xml              | 10 +++++-----
 indra/newview/pipeline.cpp | 34 +++++++++++++++++++++++++---------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index ac7105c8b5..bd849c46de 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1112,7 +1112,7 @@
               <key>hash</key>
               <string>dfd1e738be5d48f5d99a903936cbce31</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252987/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120404.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253100/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120404.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -1122,9 +1122,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>2656b0b7eddf19ca67ad5b55100b8782</string>
+              <string>b98d39ed597a56a4f6c1e9624ad4c92c</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252987/arch/Linux/installer/llphysicsextensions-0.1-linux-20120404.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253100/arch/Linux/installer/llphysicsextensions-0.1-linux-20120405.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
@@ -1134,9 +1134,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>5ad3230901d4683902aa3bdf995309b2</string>
+              <string>5bcff9a15f78ffe09aafd5fbe02076cb</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252987/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120404.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253100/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120404.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index fb6e97ea9d..d00ad3b5bb 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4341,11 +4341,7 @@ void LLPipeline::renderDebug()
 						gPathfindingProgram.uniform1f("alpha_scale", 1.f);
 					}
 
-					if ( pathfindingConsole->isRenderWorld() )
-					{					
-						glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );	
-					}
-					else
+					if ( !pathfindingConsole->isRenderWorld() )
 					{
 						const LLColor4 &clearColor = pathfindingConsole->mNavMeshColors.mNavMeshClear;
 						gGL.setColorMask(true, true);
@@ -4361,11 +4357,21 @@ void LLPipeline::renderDebug()
 						glLineWidth(2.0f);	
 						LLGLEnable cull(GL_CULL_FACE);
 						LLGLDisable blend(GL_BLEND);
-													
+						
 						int materialIndex = pathfindingConsole->getHeatMapType();
-						llPathingLibInstance->renderNavMesh( materialIndex );
 						
-						//render edges
+						if ( pathfindingConsole->isRenderWorld() )
+						{					
+							LLGLEnable blend(GL_BLEND);
+							gPathfindingProgram.uniform1f("alpha_scale", 0.66f);
+							llPathingLibInstance->renderNavMesh( materialIndex );
+						}
+						else
+						{
+							llPathingLibInstance->renderNavMesh( materialIndex );
+						}
+						
+												//render edges
 						if (LLGLSLShader::sNoFixedFunction)
 						{
 							gPathfindingNoNormalsProgram.bind();
@@ -4388,7 +4394,17 @@ void LLPipeline::renderDebug()
 					if ( pathfindingConsole->isRenderPath() )
 					{
 						LLGLEnable blend(GL_BLEND);
-						llPathingLibInstance->renderPath();
+						if (LLGLSLShader::sNoFixedFunction)
+						{
+							gUIProgram.bind();
+							gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sWhiteImagep);
+							llPathingLibInstance->renderPath();
+							gPathfindingProgram.bind();
+						}
+						else
+						{
+							llPathingLibInstance->renderPath();
+						}
 					}
 					//physics/exclusion shapes
 					if ( pathfindingConsole->isRenderAnyShapes() )
-- 
cgit v1.2.3