Moving the bulk of the display settings into the viewer.

1 files changed, 24 insertions, 19 deletions

diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 0774ab4029..c58783d64b 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -900,26 +900,31 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 				//Render any navmesh geometry	
 				LLPathingLib *llPathingLibInstance = LLPathingLib::getInstance();
 				if ( llPathingLibInstance != NULL ) 
-				{	
-					//Determine if we can should overlay the navmesh ontop of the scenes typical renderables
-					allowRenderables = llPathingLibInstance->getRenderOverlayMode();
-
-					//NavMesh
-					if ( llPathingLibInstance->getRenderNavMeshState() )
-					{
-						llPathingLibInstance->renderNavMesh();
-						exclusiveDraw = true;
-					}
-					//physics/exclusion shapes
-					if ( llPathingLibInstance->getRenderShapesState() )
-					{						
-						llPathingLibInstance->renderNavMeshShapesVBO();
-						exclusiveDraw = true;
-					}	
-					//User designated path
-					if ( llPathingLibInstance->getRenderPathState() )
+				{
+					LLHandle<LLFloaterPathfindingConsole> pathfindingConsoleHandle = LLFloaterPathfindingConsole::getInstanceHandle();
+					if (!pathfindingConsoleHandle.isDead())
 					{
-						llPathingLibInstance->renderPath();
+						LLFloaterPathfindingConsole *pathfindingConsole = pathfindingConsoleHandle.get();
+						//Determine if we can should overlay the navmesh ontop of the scenes typical renderables
+						allowRenderables = pathfindingConsole->isRenderWorld();
+
+						//NavMesh
+						if (pathfindingConsole->isRenderNavMesh())
+						{
+							llPathingLibInstance->renderNavMesh();
+							exclusiveDraw = true;
+						}
+						//physics/exclusion shapes
+						if (pathfindingConsole->isRenderExclusionVolumes())
+						{						
+							llPathingLibInstance->renderNavMeshShapesVBO();
+							exclusiveDraw = true;
+						}	
+						//User designated path
+						if (pathfindingConsole->isRenderPath())
+						{
+							llPathingLibInstance->renderPath();
+						}
 					}
 				}			
 			}