diff options
Diffstat (limited to 'indra/newview/skins/default')
3 files changed, 65 insertions, 49 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml index 9ae28d6a15..8cd220553f 100644 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml @@ -1,16 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater open_positioning="cascading" + can_resize="true" can_tear_off="false" height="273" + width="635" + min_height="273" + min_width="635" layout="topleft" name="floater_pathfinding_characters" help_topic="floater_pathfinding_characters" reuse_instance="true" - save_rect="true" + save_rect="false" single_instance="true" - title="Pathfinding characters" - width="635"> + title="Pathfinding characters"> <floater.string name="characters_messaging_initial"></floater.string> <floater.string name="characters_messaging_fetch_starting">Building query for pathfinding characters ...</floater.string> <floater.string name="characters_messaging_fetch_inprogress">Querying for pathfinding characters ...</floater.string> @@ -19,6 +22,7 @@ <floater.string name="characters_messaging_fetch_error">Error detected while querying for pathfinding characters</floater.string> <floater.string name="characters_messaging_complete_none_found">No pathfinding characters</floater.string> <floater.string name="characters_messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL]</floater.string> + <floater.string name="characters_messaging_service_not_available">Required capability is not available in current region</floater.string> <scroll_list column_padding="0" draw_heading="true" @@ -33,7 +37,7 @@ <scroll_list.columns label="Name" name="name" - width="137" /> + dynamic_width="true" /> <scroll_list.columns label="Description" name="description" @@ -52,21 +56,21 @@ width="64" /> </scroll_list> <text - height="13" - word_wrap="false" + height="26" + word_wrap="true" use_ellipses="false" type="string" text_color="LabelTextColor" length="1" - follows="left|top" + follows="left|bottom" layout="topleft" name="characters_status" top="161" - width="500"> + width="240"> Characters: </text> <button - follows="right|top" + follows="right|bottom" height="21" label="Refresh list" layout="topleft" @@ -75,7 +79,7 @@ left="257" width="115"/> <button - follows="right|top" + follows="right|bottom" height="21" label="Select all" layout="topleft" @@ -84,7 +88,7 @@ left="378" width="115"/> <button - follows="right|top" + follows="right|bottom" height="21" label="Select none" layout="topleft" @@ -94,7 +98,7 @@ width="115"/> <view_border bevel_style="none" - follows="top|left" + follows="left|right|bottom" height="0" layout="topleft" name="horiz_separator" @@ -109,15 +113,16 @@ text_color="LabelTextColor" text_readonly_color="LabelDisabledColor" length="1" - follows="left|top" + follows="left|bottom" layout="topleft" name="actions_label" top_pad="12" - width="910"> + width="242"> Actions on selected characters: </text> <check_box height="19" + follows="left|bottom" label="Show beacon" layout="topleft" name="show_beacon" @@ -125,7 +130,7 @@ left="259" width="90" /> <button - follows="right|top" + follows="left|bottom" height="22" label="Take" layout="topleft" @@ -134,7 +139,7 @@ left="17" width="94"/> <button - follows="right|top" + follows="left|bottom" height="22" label="Take copy" layout="topleft" @@ -143,7 +148,7 @@ left="119" width="94"/> <button - follows="right|top" + follows="left|bottom" height="22" label="Return" layout="topleft" @@ -152,7 +157,7 @@ left="220" width="94"/> <button - follows="right|top" + follows="left|bottom" height="22" label="Delete" layout="topleft" @@ -161,7 +166,7 @@ left="322" width="94"/> <button - follows="right|top" + follows="left|bottom" height="22" label="Teleport me to it" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml index 65c0bf3cca..ec720b55ca 100644 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml @@ -1,16 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater open_positioning="cascading" + can_resize="true" can_tear_off="false" height="330" + width="950" + min_height="330" + min_width="950" layout="topleft" name="floater_pathfinding_linksets" help_topic="floater_pathfinding_linksets" reuse_instance="true" - save_rect="true" + save_rect="false" single_instance="true" - title="Pathfinding linksets" - width="950"> + title="Pathfinding linksets"> <floater.string name="linksets_messaging_initial"></floater.string> <floater.string name="linksets_messaging_fetch_starting">Building query for pathfinding linksets ...</floater.string> <floater.string name="linksets_messaging_fetch_inprogress">Querying for pathfinding linksets ...</floater.string> @@ -23,6 +26,7 @@ <floater.string name="linksets_messaging_modify_error">Error detected while modifying for pathfinding linksets</floater.string> <floater.string name="linksets_messaging_complete_none_found">No pathfinding linksets</floater.string> <floater.string name="linksets_messaging_complete_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL]</floater.string> + <floater.string name="linksets_messaging_service_not_available">Required capability is not available in current region</floater.string> <floater.string name="linkset_path_state_walkable">Walkable</floater.string> <floater.string name="linkset_path_state_obstacle">Obstacle</floater.string> <floater.string name="linkset_path_state_ignored">Ignored</floater.string> @@ -59,7 +63,7 @@ <line_editor border_style="line" border_thickness="1" - follows="top|left" + follows="left|top" height="20" layout="topleft" left_delta="62" @@ -84,7 +88,7 @@ <line_editor border_style="line" border_thickness="1" - follows="top|left" + follows="left|top" height="20" layout="topleft" left_delta="88" @@ -94,6 +98,7 @@ width="106" /> <check_box height="19" + follows="left|top" initial_value="true" label="Walkable" layout="topleft" @@ -103,6 +108,7 @@ width="90" /> <check_box height="19" + follows="left|top" initial_value="true" label="Obstacle" layout="topleft" @@ -112,6 +118,7 @@ width="90" /> <check_box height="19" + follows="left|top" initial_value="true" label="Ignored" layout="topleft" @@ -151,7 +158,7 @@ <scroll_list.columns label="Name (root prim)" name="name" - width="173" /> + dynamic_width="true" /> <scroll_list.columns label="Description (root prim)" name="description" @@ -196,7 +203,7 @@ type="string" text_color="LabelTextColor" length="1" - follows="left|top" + follows="left|bottom" layout="topleft" name="linksets_status" top="200" @@ -204,7 +211,7 @@ Linksets: </text> <button - follows="right|top" + follows="right|bottom" height="21" label="Refresh list" layout="topleft" @@ -213,7 +220,7 @@ left="568" width="115"/> <button - follows="right|top" + follows="right|bottom" height="21" label="Select all" layout="topleft" @@ -222,7 +229,7 @@ left="690" width="115"/> <button - follows="right|top" + follows="right|bottom" height="21" label="Select none" layout="topleft" @@ -232,7 +239,7 @@ width="115"/> <view_border bevel_style="none" - follows="top|left" + follows="left|bottom|right" height="0" layout="topleft" name="horiz_separator" @@ -246,14 +253,14 @@ type="string" text_color="LabelTextColor" length="1" - follows="left|top" + follows="left|bottom" 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> <radio_group - follows="top|left" + follows="left|bottom" height="55" value="1" layout="topleft" @@ -289,7 +296,7 @@ text_readonly_color="LabelDisabledColor" name="walkability_coefficients_label" length="1" - follows="left|top" + follows="left|bottom" layout="topleft" left="159" top="271" @@ -305,7 +312,7 @@ text_readonly_color="LabelDisabledColor" name="edit_a_label" length="1" - follows="left|top" + follows="left|bottom" layout="topleft" top_pad="12" width="90"> @@ -314,7 +321,7 @@ <line_editor border_style="line" border_thickness="1" - follows="top|left" + follows="left|bottom" height="20" layout="topleft" left_delta="14" @@ -330,7 +337,7 @@ text_readonly_color="LabelDisabledColor" name="edit_b_label" length="1" - follows="left|top" + follows="left|bottom" layout="topleft" left="248" top_pad="-13" @@ -340,7 +347,7 @@ <line_editor border_style="line" border_thickness="1" - follows="top|left" + follows="left|bottom" height="20" layout="topleft" left_delta="14" @@ -356,7 +363,7 @@ text_readonly_color="LabelDisabledColor" name="edit_c_label" length="1" - follows="left|top" + follows="left|bottom" layout="topleft" left="337" top_pad="-13" @@ -366,7 +373,7 @@ <line_editor border_style="line" border_thickness="1" - follows="top|left" + follows="left|bottom" height="20" layout="topleft" left_delta="14" @@ -382,7 +389,7 @@ text_readonly_color="LabelDisabledColor" name="edit_d_label" length="1" - follows="left|top" + follows="left|bottom" layout="topleft" left="426" top_pad="-13" @@ -392,7 +399,7 @@ <line_editor border_style="line" border_thickness="1" - follows="top|left" + follows="left|bottom" height="20" layout="topleft" left_delta="14" @@ -400,6 +407,7 @@ name="edit_d_value" width="45" /> <check_box + follows="left|bottom" height="19" label="Phantom" layout="topleft" @@ -408,7 +416,7 @@ left="559" width="90" /> <button - follows="right|top" + follows="right|bottom" height="21" label="Apply changes" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 33a756fdd5..d8f9453b09 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -153,13 +153,6 @@ function="BuyCurrency" /> </menu_item_call> <menu_item_call - label="Merchant Outbox..." - name="MerchantOutbox"> - <menu_item_call.on_click - function="Floater.ToggleOrBringToFront" - parameter="outbox" /> - </menu_item_call> - <menu_item_call label="Account dashboard..." name="Manage My Account"> <menu_item_call.on_click @@ -2457,6 +2450,16 @@ function="Advanced.ToggleInfoDisplay" parameter="rendercomplexity" /> </menu_item_check> + <menu_item_check + label="Attachment Bytes" + name="attachment bytes"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="attachment bytes" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="attachment bytes" /> + </menu_item_check> <menu_item_check label="Sculpt" name="Sculpt"> |