diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
4 files changed, 12 insertions, 190 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml deleted file mode 100644 index 7af40bbff6..0000000000 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - open_positioning="cascading" - can_tear_off="false" - height="213" - layout="topleft" - name="floater_pathfinding_basic" - help_topic="floater_pathfinding_basic" - reuse_instance="false" - save_rect="false" - single_instance="true" - title="Basic pathfinding setup" - width="312"> - <floater.string name="status_pathfinding_not_enabled">This region is not enabled for pathfinding.</floater.string> - <floater.string name="status_unable_to_change_state">Unable to change modes successfully.</floater.string> - <floater.string name="status_querying_state">Checking status ...</floater.string> - <text - height="13" - word_wrap="false" - use_ellipses="false" - type="string" - text_color="LabelTextColor" - length="1" - follows="left|top" - layout="topleft" - left="15" - name="status_label" - top="8" - width="289"> - </text> - <text - height="13" - word_wrap="true" - use_ellipses="false" - type="string" - text_color="LabelTextColor" - text_readonly_color="LabelDisabledColor" - length="1" - follows="left|top" - layout="topleft" - left="15" - name="unfreeze_label" - top_pad="4" - width="289"> - Allow object / terrain changes: - </text> - <button - follows="left|top" - height="22" - label="Unfreeze" - layout="topleft" - name="enter_unfrozen_mode" - width="116"/> - <text - height="82" - word_wrap="true" - use_ellipses="false" - type="string" - text_color="LabelTextColor" - text_readonly_color="LabelDisabledColor" - length="1" - follows="left|top" - layout="topleft" - line_spacing.multiple="1.5" - left="15" - name="freeze_label" - top_pad="23" - width="289"> - In unfrozen mode, you can move and make changes to objects and terrain. When you are finished, click the Freeze button. It may require a few minutes to process your changes. - </text> - <button - follows="left|top" - height="22" - label="Freeze" - layout="topleft" - name="enter_frozen_mode" - top_pad="0" - width="116"/> -</floater> 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 54d44be015..59b816b0e1 100644 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml @@ -9,7 +9,7 @@ reuse_instance="true" save_rect="true" single_instance="true" - title="Pathfinding edit / test" + title="Pathfinding debug" width="456"> <floater.string name="navmesh_viewer_status_unknown"></floater.string> <floater.string name="navmesh_viewer_status_library_not_implemented">Cannot find pathing library implementation.</floater.string> @@ -21,7 +21,6 @@ <floater.string name="navmesh_viewer_status_has_navmesh">Latest navmesh has been downloaded.</floater.string> <floater.string name="navmesh_viewer_status_error">Unable to download navmesh successfully.</floater.string> <floater.string name="navmesh_simulator_status_unknown"></floater.string> - <floater.string name="navmesh_simulator_status_region_not_enabled">This region does not expose the navmesh status.</floater.string> <floater.string name="navmesh_simulator_status_pending">Navmesh has pending changes.</floater.string> <floater.string name="navmesh_simulator_status_building">Navmesh is building.</floater.string> <floater.string name="navmesh_simulator_status_some_pending">Some navmesh regions have pending changes.</floater.string> @@ -238,96 +237,9 @@ bevel_style="none" follows="left|top" layout="topleft" - name="edit_panel" - left="1" - label="Edit"> - <text - word_wrap="true" - use_ellipses="false" - type="string" - text_color="LabelTextColor" - text_readonly_color="LabelDisabledColor" - length="1" - follows="left|top" - layout="topleft" - name="unfreeze_label" - left="16" - top_pad="16" - height="13" - width="190"> - Allow object / terrain changes: - </text> - <button - follows="left|top" - height="22" - left="16" - enabled="false" - label="Unfreeze" - layout="topleft" - name="enter_unfrozen_mode" - top_pad="5" - width="116"/> - <text - word_wrap="true" - use_ellipses="false" - type="string" - text_color="LabelTextColor" - text_readonly_color="LabelDisabledColor" - length="1" - follows="left|top" - layout="topleft" - left="16" - name="edit_linksets_label" - top_pad="23" - height="13" - width="190"> - Edit linkset attributes: - </text> - <button - follows="left|top" - height="22" - left="16" - label="Linksets..." - layout="topleft" - name="view_and_edit_linksets" - top_pad="5" - width="116"/> - <text - word_wrap="true" - use_ellipses="false" - type="string" - text_color="LabelTextColor" - text_readonly_color="LabelDisabledColor" - length="1" - follows="left|top" - layout="topleft" - left="16" - line_spacing.multiple="1.5" - name="freeze_label" - top_pad="23" - height="32" - width="190"> - Prevent object / terrain changes and update the navmesh: - </text> - <button - follows="left|top" - height="22" - left="16" - enabled="false" - label="Freeze" - layout="topleft" - name="enter_frozen_mode" - top_pad="3" - width="116"/> - </panel> - <panel - border="false" - bevel_style="none" - follows="left|top" - layout="topleft" left="1" name="test_panel" - label="Test"> + label="Test path"> <text height="14" word_wrap="true" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index ad02beff7a..ecc96ab402 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -943,31 +943,13 @@ name="Pathfinding" tear_off="false"> <menu_item_call - label="Basic setup..." - name="pathfinding_basic_menu_item"> - <menu_item_call.on_click - function="Floater.ToggleOrBringToFront" - parameter="pathfinding_basic" /> - <menu_item_call.on_enable - function="Tools.EnablePathfinding" /> - </menu_item_call> - <menu_item_call - label="Edit / test..." - name="pathfinding_console_menu_item"> - <menu_item_call.on_click - function="Floater.ToggleOrBringToFront" - parameter="pathfinding_console" /> - <menu_item_call.on_enable - function="Tools.EnablePathfinding" /> - </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.on_enable - function="Tools.EnablePathfindingLinksets" /> + function="Tools.EnablePathfinding" /> </menu_item_call> <menu_item_call label="Characters..." @@ -978,6 +960,15 @@ <menu_item_call.on_enable function="Tools.EnablePathfinding" /> </menu_item_call> + <menu_item_call + label="Pathfinding debug..." + name="pathfinding_console_menu_item"> + <menu_item_call.on_click + function="Floater.ToggleOrBringToFront" + parameter="pathfinding_console" /> + <menu_item_call.on_enable + function="Tools.EnablePathfindingDebug" /> + </menu_item_call> </menu> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 15963af960..e6af4cf5a6 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3832,7 +3832,6 @@ Try enclosing path to the editor with double quotes. <string name="Command_Outbox_Label">Merchant outbox</string> <string name="Command_Pathfinding_Label">Pathfinding</string> <string name="Command_People_Label">People</string> - <string name="Command_PF_Basic_Label">Pathfinding Basic</string> <string name="Command_PF_Characters_Label">Pathfinding Characters</string> <string name="Command_PF_Linksets_Label">Pathfinding Linksets</string> <string name="Command_Picks_Label">Picks</string> @@ -3862,7 +3861,6 @@ Try enclosing path to the editor with double quotes. <string name="Command_Outbox_Tooltip">Transfer items to your marketplace for sale</string> <string name="Command_Pathfinding_Tooltip">Information about pathfinding</string> <string name="Command_People_Tooltip">Friends, groups, and nearby people</string> - <string name="Command_PF_Basic_Tooltip">Manipulation of pathfinding frozen/unfrozen state</string> <string name="Command_PF_Characters_Tooltip">Manipulation of pathfinding characters</string> <string name="Command_PF_Linksets_Tooltip">Manipulation of pathfinding linksets</string> <string name="Command_Picks_Tooltip">Places to show as favorites in your profile</string> |