diff options
| -rw-r--r-- | indra/newview/app_settings/commands.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 66 |
2 files changed, 40 insertions, 30 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 5d970c06e2..b373ec0807 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -146,7 +146,7 @@ is_running_parameters="people" /> <command name="pathfinding_console" - available_in_toybox="true" + available_in_toybox="false" icon="Command_Pathfinding_Icon" label_ref="Command_Pathfinding_Label" tooltip_ref="Command_Pathfinding_Tooltip" @@ -156,7 +156,7 @@ is_running_parameters="pathfinding_console" /> <command name="pathfinding_linksets" - available_in_toybox="true" + available_in_toybox="false" icon="Command_PF_Linksets_Icon" label_ref="Command_PF_Linksets_Label" tooltip_ref="Command_PF_Linksets_Tooltip" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 28e9052ddb..d2a5556124 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -692,34 +692,6 @@ function="Build.Enabled" /> </menu_item_check> - <menu - create_jump_keys="true" - label="Pathing Tools" - name="Pathing Tools" - tear_off="true" - visible="true"> - <menu_item_call - label="Retrieve Navigation Mesh Src" - name="Show Pathing Tools"> - <menu_item_call.on_click - 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 create_jump_keys="true" label="Select Build Tool" @@ -976,6 +948,44 @@ </menu_item_call> </menu> + <menu_item_call + label="Pathfinding..." + name="pathfinding_menu_item"> + <menu_item_call.on_click + function="Floater.ToggleOrBringToFront" + parameter="pathfinding_console" /> + </menu_item_call> + + <menu_item_separator/> + + <menu + create_jump_keys="true" + label="Pathing Tools" + name="Pathing Tools" + tear_off="true" + visible="true"> + <menu_item_call + label="Retrieve Navigation Mesh Src" + name="Show Pathing Tools"> + <menu_item_call.on_click + 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/> <menu |