From 64acf29c53639cbd3784f5bcc617b02985cbe412 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 16 Dec 2011 17:30:12 -0800
Subject: Hooking the navmesh and exclusion volumes render states up to the
 pathfinding console floater.

---
 .../skins/default/xui/en/floater_pathfinding_console.xml    |  8 ++++----
 indra/newview/skins/default/xui/en/menu_viewer.xml          | 13 -------------
 2 files changed, 4 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index dfb2eca4c8..ff1cf81d4e 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -28,7 +28,7 @@
       label="Navmesh"
       layout="topleft"
       left="20"
-      name="DisplayNavmeshOverlay"
+      name="show_navmesh_overlay"
       top_pad="5"
       width="90" />
   <check_box
@@ -36,7 +36,7 @@
       label="Exclusion volumes"
       layout="topleft"
       left="20"
-      name="DisplayExclusionVolumes"
+      name="show_exclusion_volumes"
       top_pad="0"
       width="90" />
   <check_box
@@ -44,7 +44,7 @@
       label="Path"
       layout="topleft"
       left="20"
-      name="DisplayPath"
+      name="show_path"
       top_pad="0"
       width="90" />
   <check_box
@@ -52,7 +52,7 @@
       label="Water plane"
       layout="topleft"
       left="20"
-      name="DisplayWaterPlane"
+      name="show_water_plane"
       top_pad="0"
       width="90" />
   <text
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d2a5556124..986f7b226e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -971,19 +971,6 @@
                 function="PathingTools.RetrieveSrc" />
           </menu_item_call>
 
-          <menu_item_call
-              label="Toggle Navigation Mesh Display"
-              name="Toggle Navigation Mesh View">
-            <menu_item_call.on_click
-                function="PathingTools.ToggleNavMeshView" />
-          </menu_item_call>
-
-          <menu_item_call
-              label="Toggle Navigation Mesh Shape Display"
-              name="Toggle Navigation Mesh Shape View">
-            <menu_item_call.on_click
-                function="PathingTools.ToggleNavMeshShapeView" />
-          </menu_item_call>
         </menu>
 
         <menu_item_separator/>
-- 
cgit v1.2.3