diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml
index 7b751d525f..37555eea3a 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml
@@ -9,7 +9,7 @@
     reuse_instance="true"
     save_rect="true"
     single_instance="true"
-    title="Pathfinding"
+    title="Pathfinding setup"
     width="833">
   <floater.string name="navmesh_fetch_initial"></floater.string>
   <floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 967ea598b8..f952fc3266 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -938,15 +938,37 @@
           </menu_item_call>
         </menu>
 
+      <menu
+         create_jump_keys="true"
+         label="Pathfinding"
+         name="Pathfindubg"
+         tear_off="false">
         <menu_item_call
-            label="Pathfinding..."
-            name="pathfinding_menu_item">
-            <menu_item_call.on_click
-                function="Floater.ToggleOrBringToFront"
-                parameter="pathfinding_setup" />
+            label="Setup..."
+            name="pathfinding_setup_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_setup" />
         </menu_item_call>
+        <menu_item_call
+            label="Linksets..."
+            name="pathfinding_linksets_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_linksets" />
+        </menu_item_call>
+        <menu_item_call
+            label="Characters..."
+            enabled="false"
+            name="pathfinding_characters_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_linksets" />
+        </menu_item_call>
+      </menu>
 
-        <menu_item_separator/>
+
+      <menu_item_separator/>
 
         <menu
          create_jump_keys="true"