diff options
Diffstat (limited to 'indra/newview/skins/default')
5 files changed, 869 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 8702ebde2a..ee854d96e5 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -137,7 +137,9 @@ with the same filename but different name <texture name="Command_MiniCart_Icon" file_name="toolbar_icons/mini_cart.png" preload="true" /> <texture name="Command_MiniMap_Icon" file_name="toolbar_icons/mini_map.png" preload="true" /> <texture name="Command_Move_Icon" file_name="toolbar_icons/move.png" preload="true" /> + <texture name="Command_Pathfinding_Icon" file_name="toolbar_icons/land.png" preload="true" /> <texture name="Command_People_Icon" file_name="toolbar_icons/people.png" preload="true" /> + <texture name="Command_PF_Linksets_Icon" file_name="toolbar_icons/land.png" preload="true" /> <texture name="Command_Picks_Icon" file_name="toolbar_icons/picks.png" preload="true" /> <texture name="Command_Places_Icon" file_name="toolbar_icons/places.png" preload="true" /> <texture name="Command_Preferences_Icon" file_name="toolbar_icons/preferences.png" preload="true" /> diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml new file mode 100644 index 0000000000..5716ec30b7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml @@ -0,0 +1,460 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + open_positioning="cascading" + can_tear_off="false" + height="228" + layout="topleft" + name="floater_pathfinding" + help_topic="floater_pathfinding" + reuse_instance="true" + save_rect="true" + single_instance="true" + title="Pathfinding" + width="833"> + <text + height="13" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="12" + top="20" + width="208"> + Show overlays: + </text> + <check_box + height="19" + label="Navmesh" + layout="topleft" + left="20" + name="show_navmesh_overlay" + top_pad="5" + width="90" /> + <check_box + height="19" + label="Exclusion volumes" + layout="topleft" + left="20" + name="show_exclusion_volumes" + top_pad="0" + width="90" /> + <check_box + height="19" + label="Path" + layout="topleft" + left="20" + name="show_path" + top_pad="0" + width="90" /> + <check_box + height="19" + label="Water plane" + layout="topleft" + left="20" + name="show_water_plane" + top_pad="0" + width="90" /> + <text + height="13" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + layout="topleft" + left="12" + top_pad="10" + width="208"> + Overlay on: + </text> + <radio_group + follows="top|left" + height="45" + value="1" + layout="topleft" + left_delta="8" + name="region_overlay_display" + top_delta="17" + width="200"> + <radio_item + label="Fixed physics geometry" + layout="topleft" + height="14" + name="display_overlay_on_fixed" + value="1"/> + <radio_item + label="All renderable geometry" + layout="topleft" + height="14" + name="display_overlay_on_all" + value="2"/> + </radio_group> + <view_border + bevel_style="none" + follows="top|left" + height="203" + layout="topleft" + name="horiz_separator_1" + top="15" + left="228" + width="0"/> + <text + height="24" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + line_spacing.pixels="2" + follows="left|top" + layout="topleft" + left="240" + top="18" + width="208"> +Click on two points +to see the path between them. + </text> + <radio_group + allow_deselect="true" + follows="top|left" + height="45" + layout="topleft" + left_delta="0" + name="path_selection" + top_delta="33" + value="0" + width="200"> + <radio_item + label="Choose start point" + layout="topleft" + height="14" + name="choose_path_start_point" + value="1"/> + <radio_item + label="Choose end point" + layout="topleft" + height="14" + name="choose_path_end_point" + value="2"/> + </radio_group> + <text + height="14" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="240" + width="208"> + Character width + </text> + <slider + decimal_digits="1" + height="14" + increment="0.1" + layout="topleft" + max_val="2" + min_val="0.2" + name="character_width" + top_pad="7" + value="1" + width="145" /> + <text + height="14" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + top_pad="-14" + left="382" + width="208"> + m + </text> + <text + height="14" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="240" + top_pad="10" + width="208"> + Character type + </text> + <radio_group + follows="top|left" + height="20" + layout="topleft" + left_delta="0" + name="character_type" + top_delta="20" + value="1" + width="200"> + <radio_item + label="A" + height="14" + width="30" + value="1" + name="character_type_a"/> + <radio_item + label="B" + height="14" + width="30" + layout="topleft" + top="4" + left="50" + value="2" + name="character_type_b"/> + <radio_item + label="C" + height="14" + width="30" + layout="topleft" + top="4" + left="100" + value="3" + name="character_type_c"/> + <radio_item + label="D" + height="14" + width="30" + layout="topleft" + top="4" + left="150" + value="4" + name="character_type_d"/> + </radio_group> + <text + height="14" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="DrYellow" + length="1" + follows="left|top" + layout="topleft" + left="240" + top_pad="10" + width="208"> + Result: No path found. + </text> + <view_border + bevel_style="none" + follows="top|left" + height="203" + layout="topleft" + name="horiz_separator_2" + top="15" + left="456" + width="0"/> + <text + height="13" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="470" + top="18" + width="180"> + View / edit linkset attributes: + </text> + <button + follows="left|top" + height="21" + label="Linksets..." + layout="topleft" + name="view_and_edit_linksets" + width="96"/> + <text + height="25" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + line_spacing.pixels="4" + follows="left|top" + layout="topleft" + top_pad="22" + width="180"> +If you have made changes +to objects or terrain: + </text> + <button + follows="left|top" + height="22" + label="Rebuild navmesh" + layout="topleft" + name="rebuild_navmesh" + top_pad="14" + width="149"/> + <text + height="25" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + line_spacing.pixels="4" + follows="left|top" + layout="topleft" + top_pad="14" + width="180"> +To load the current state +of the mesh: + </text> + <button + follows="left|top" + height="21" + label="Refresh" + layout="topleft" + name="refresh_navmesh" + top_pad="9" + width="95"/> + <view_border + bevel_style="none" + follows="top|left" + height="203" + layout="topleft" + name="horiz_separator_3" + top="15" + left="667" + width="0"/> + <text + height="13" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="689" + top="18" + width="208"> + Terrain materials + </text> + <text + height="13" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + top_pad="17" + width="208"> + A + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="top|left" + height="21" + layout="topleft" + left_delta="22" + max_length_bytes="10" + name="terrain_material_a" + width="46" /> + <text + height="13" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + layout="topleft" + left_pad="-68" + top_pad="17" + width="208"> + B + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="top|left" + height="21" + layout="topleft" + left_delta="22" + max_length_bytes="10" + name="terrain_material_b" + width="46" /> + <text + height="13" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + layout="topleft" + left_pad="-68" + top_pad="17" + width="208"> + C + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="top|left" + height="21" + layout="topleft" + left_delta="22" + max_length_bytes="10" + name="terrain_material_c" + width="46" /> + <text + height="13" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + layout="topleft" + left_pad="-68" + top_pad="17" + width="208"> + D + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="top|left" + height="21" + layout="topleft" + left_delta="22" + max_length_bytes="10" + name="terrain_material_d" + width="46" /> + <text + height="38" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + line_spacing.pixels="4" + follows="left|top" + layout="topleft" + left_pad="-68" + top_pad="14" + width="180"> +Rebuild the navmesh +after making any +changes. + </text> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml new file mode 100644 index 0000000000..21711880af --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml @@ -0,0 +1,386 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + open_positioning="cascading" + can_tear_off="false" + height="330" + layout="topleft" + name="floater_pathfinding_linksets" + help_topic="floater_pathfinding_linksets" + reuse_instance="true" + save_rect="true" + single_instance="true" + title="Pathfinding linksets" + width="950"> + <floater.string name="linksets_fetching_initial"></floater.string> + <floater.string name="linksets_fetching_starting">Building query for pathfinding linksets ...</floater.string> + <floater.string name="linksets_fetching_inprogress">Querying for pathfinding linksets ...</floater.string> + <floater.string name="linksets_fetching_inprogress_multi_request">Querying for pathfinding linksets (already in progress) ...</floater.string> + <floater.string name="linksets_fetching_received">Loading pathfinding linksets data from response ...</floater.string> + <floater.string name="linksets_fetching_error">Error detected while querying for pathfinding linksets</floater.string> + <floater.string name="linksets_fetching_done_none_found">No pathfinding linksets</floater.string> + <floater.string name="linksets_fetching_done_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL]</floater.string> + <floater.string name="linkset_is_fixed">Fixed</floater.string> + <floater.string name="linkset_is_not_fixed">Not fixed</floater.string> + <floater.string name="linkset_is_walkable">Walkable</floater.string> + <floater.string name="linkset_is_not_walkable">--</floater.string> + <floater.string name="linkset_is_phantom">Phantom</floater.string> + <floater.string name="linkset_is_not_phantom">--</floater.string> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="20" + top="16" + width="90"> + Filter list by: + </text> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="109" + top="16" + width="94"> + Portion of name + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="top|left" + height="20" + layout="topleft" + left_delta="93" + top="11" + max_length_bytes="10" + name="filter_by_name" + width="115" /> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="336" + top="16" + width="132"> + Portion of description + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="top|left" + height="20" + layout="topleft" + left_delta="131" + top="11" + max_length_bytes="10" + name="filter_by_description" + width="115" /> + <check_box + height="19" + label="Fixed" + layout="topleft" + left="591" + top="14" + name="filter_by_fixed" + width="90" /> + <check_box + height="19" + label="Walkable" + layout="topleft" + left="671" + top="14" + name="filter_by_walkable" + width="90" /> + <button + follows="right|top" + height="21" + label="Apply" + layout="topleft" + name="apply_filters" + top="11" + left="769" + width="73"/> + <button + follows="right|top" + height="21" + label="Clear" + layout="topleft" + name="clear_filters" + top="11" + left="851" + width="73"/> + <scroll_list + column_padding="0" + draw_heading="true" + follows="all" + height="135" + layout="topleft" + left="18" + top="48" + multi_select="true" + name="pathfinding_linksets" + width="910"> + <scroll_list.columns + label="Name (root prim)" + name="name" + width="152" /> + <scroll_list.columns + label="Description (root prim)" + name="description" + width="191" /> + <scroll_list.columns + label="Land impact" + name="land_impact" + width="85" /> + <scroll_list.columns + label="Dist from you" + name="dist_from_you" + width="87" /> + <scroll_list.columns + label="Fixed" + name="is_fixed" + width="63" /> + <scroll_list.columns + label="Walkable" + name="is_walkable" + width="73" /> + <scroll_list.columns + label="Phantom" + name="is_phantom" + width="74" /> + <scroll_list.columns + label="A %" + name="a_percent" + width="41" /> + <scroll_list.columns + label="B %" + name="b_percent" + width="41" /> + <scroll_list.columns + label="C %" + name="c_percent" + width="41" /> + <scroll_list.columns + label="D %" + name="d_percent" + width="41" /> + </scroll_list> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + name="linksets_status" + top="200" + width="500"> + Linksets: + </text> + <button + follows="right|top" + height="21" + label="Refresh list" + layout="topleft" + name="refresh_linksets_list" + top="200" + left="568" + width="115"/> + <button + follows="right|top" + height="21" + label="Select all" + layout="topleft" + name="select_all_linksets" + top="200" + left="690" + width="115"/> + <button + follows="right|top" + height="21" + label="Select none" + layout="topleft" + name="select_none_linksets" + top="200" + left="812" + width="115"/> + <view_border + bevel_style="none" + follows="top|left" + height="0" + layout="topleft" + name="horiz_separator" + top="230" + left="20" + width="912"/> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + top_pad="12" + width="910"> + Select row(s) to edit attributes of linkset(s). If a linkset is deleted or returned to inventory, attributes assigned to it will be lost. + </text> + <check_box + height="19" + label="Fixed" + layout="topleft" + name="edit_fixed_value" + top_pad="10" + width="90" /> + <check_box + height="19" + label="Walkable" + layout="topleft" + name="edit_walkable_value" + top_pad="5" + left="38" + width="90" /> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="159" + top="271" + width="200"> + Walkability coefficients + </text> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + top_pad="12" + width="90"> + A + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="top|left" + height="20" + layout="topleft" + left_delta="14" + max_length_bytes="10" + name="edit_a_value" + width="45" /> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="248" + top_pad="-13" + width="90"> + B + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="top|left" + height="20" + layout="topleft" + left_delta="14" + max_length_bytes="10" + name="edit_b_value" + width="45" /> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="337" + top_pad="-13" + width="90"> + C + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="top|left" + height="20" + layout="topleft" + left_delta="14" + max_length_bytes="10" + name="edit_c_value" + width="45" /> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="426" + top_pad="-13" + width="90"> + D + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="top|left" + height="20" + layout="topleft" + left_delta="14" + max_length_bytes="10" + name="edit_d_value" + width="45" /> + <check_box + height="19" + label="Phantom" + layout="topleft" + name="edit_phantom_value" + top="271" + left="559" + width="90" /> + <button + follows="right|top" + height="21" + label="Apply changes" + layout="topleft" + name="apply_edit_values" + top="270" + left="735" + width="134"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index ec2dd10248..a95ed572f9 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -691,6 +691,7 @@ <menu_item_check.on_enable function="Build.Enabled" /> </menu_item_check> + <menu create_jump_keys="true" label="Select Build Tool" @@ -947,6 +948,14 @@ </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 @@ -1133,6 +1142,14 @@ <menu_item_call.on_visible function="File.VisibleUploadModel"/> </menu_item_call> + <menu_item_call + label="BuildNavMeshTest" + layout="topleft" + name="BuildNavMesh"> + <menu_item_call.on_click + function="File.UploadNavMesh" + parameter="" /> + </menu_item_call> <menu_item_call label="Bulk (L$[COST] per file)..." layout="topleft" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2b0dcdfeca..8d6d4801bf 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3681,7 +3681,9 @@ Try enclosing path to the editor with double quotes. <string name="Command_Marketplace_Label">Marketplace</string> <string name="Command_MiniMap_Label">Mini-map</string> <string name="Command_Move_Label">Walk / run / fly</string> + <string name="Command_Pathfinding_Label">Pathfinding</string> <string name="Command_People_Label">People</string> + <string name="Command_PF_Linksets_Label">Pathfinding Linksets</string> <string name="Command_Picks_Label">Picks</string> <string name="Command_Places_Label">Places</string> <string name="Command_Preferences_Label">Preferences</string> @@ -3706,7 +3708,9 @@ Try enclosing path to the editor with double quotes. <string name="Command_Marketplace_Tooltip">Go shopping</string> <string name="Command_MiniMap_Tooltip">Show nearby people</string> <string name="Command_Move_Tooltip">Moving your avatar</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_Linksets_Tooltip">Manipulation of pathfinding linksets</string> <string name="Command_Picks_Tooltip">Places to show as favorites in your profile</string> <string name="Command_Places_Tooltip">Places you've saved</string> <string name="Command_Preferences_Tooltip">Preferences</string> |