diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
17 files changed, 108 insertions, 102 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml index bad6e1e212..c205868429 100644 --- a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml @@ -32,12 +32,4 @@ function="IMChicletMenu.Action" parameter="add" /> </menu_item_call> - <menu_item_call - label="Remove Friend..." - layout="topleft" - name="Remove Friend"> - <menu_item_call.on_click - function="IMChicletMenu.Action" - parameter="remove" /> - </menu_item_call> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_landmark.xml b/indra/newview/skins/default/xui/en/menu_landmark.xml index 64f6ce9bb5..9263f75d24 100644 --- a/indra/newview/skins/default/xui/en/menu_landmark.xml +++ b/indra/newview/skins/default/xui/en/menu_landmark.xml @@ -22,7 +22,6 @@ parameter="delete" /> </menu_item_call> <menu_item_call - enabled="false" label="Create Pick" layout="topleft" name="pick"> diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml new file mode 100644 index 0000000000..bb5a4e51f7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu name="menu_group_plus" + left="0" bottom="0" visible="false" + mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true"> + <menu_item_call name="sort_name" label="Sort by Name"> + <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="sort_name" /> + </menu_item_call> + <menu_item_call name="sort_status" label="Sort by Status"> + <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="sort_status" /> + </menu_item_call> + <menu_item_separator layout="topleft" /> + <menu_item_call name="view_icons" label="View People Icons"> + <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="view_icons" /> + </menu_item_call> + <menu_item_call name="organize_offline" label="Organize Offline Friends"> + <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="organize_offline" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml new file mode 100644 index 0000000000..8c2c5e8c9e --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu name="menu_group_plus" + left="0" bottom="0" visible="false" + mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true"> + <menu_item_call name="sort_recent" label="Sort by Recent Speakers"> + <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="sort_recent" /> + </menu_item_call> + <menu_item_call name="sort_name" label="Sort by Name"> + <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="sort_name" /> + </menu_item_call> + <menu_item_call name="sort_distance" label="Sort by Distance"> + <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="sort_distance" /> + </menu_item_call> + <menu_item_separator layout="topleft" /> + <menu_item_call name="view_icons" label="View People Icons"> + <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="view_icons" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml new file mode 100644 index 0000000000..00cf443cc6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu name="menu_group_plus" + left="0" bottom="0" visible="false" + mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true"> + <menu_item_call name="sort_most" label="Sort by Most Speakers"> + <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="sort_most" /> + </menu_item_call> + <menu_item_call name="sort_name" label="Sort by Name"> + <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="sort_name" /> + </menu_item_call> + <menu_item_separator layout="topleft" /> + <menu_item_call name="view_icons" label="View People Icons"> + <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="view_icons" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_place.xml b/indra/newview/skins/default/xui/en/menu_place.xml index a9f98e35cc..01f62985ca 100644 --- a/indra/newview/skins/default/xui/en/menu_place.xml +++ b/indra/newview/skins/default/xui/en/menu_place.xml @@ -14,7 +14,6 @@ parameter="landmark" /> </menu_item_call> <menu_item_call - enabled="false" label="Create Pick" layout="topleft" name="pick"> diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 9910f99c17..4f241664fb 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -31,8 +31,7 @@ layout="topleft" left="0" top="0" - width="5" - min_width="5" /> + width="5"/> <layout_panel follows="left|right" height="28" @@ -55,8 +54,7 @@ left="0" name="DUMMY" top="0" - width="3" - min_width="3"/> + width="3"/> <layout_panel auto_resize="false" follows="right" @@ -94,8 +92,7 @@ left="0" name="DUMMY" top="0" - width="8" - min_width="8"/> + width="8"/> <layout_panel auto_resize="false" follows="right" @@ -185,8 +182,7 @@ left="0" name="DUMMY" top="0" - width="5" - min_width="5" /> + width="5"/> <layout_panel follows="left|right" height="28" @@ -216,8 +212,7 @@ layout="topleft" left="0" top="0" - width="5" - min_width="5" /> + width="5"/> <layout_panel auto_resize="false" follows="right" @@ -261,8 +256,7 @@ layout="topleft" left="0" top="0" - width="10" - min_width="10"/> + width="10"/> <view_border auto_resize="false" bevel_style="in" @@ -282,8 +276,7 @@ layout="topleft" left="0" top="0" - width="10" - min_width="10" /> + width="10"/> <layout_panel auto_resize="false" follows="right" @@ -327,7 +320,6 @@ layout="topleft" left="0" top="0" - width="5" - min_width="5" /> + width="5"/> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index fd154792dd..9fa2765e97 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -43,7 +43,7 @@ Hover your mouse over the options for more help. <line_editor follows="left|top" font="SansSerifSmall" - prevalidate_callback="asci" + prevalidate_callback="ascii" halign="left" height="16" label="Type your new group name here" @@ -65,7 +65,6 @@ Hover your mouse over the options for more help. width="100" /> <text type="string" - length="1" follows="left|top" height="16" layout="topleft" @@ -78,7 +77,6 @@ Hover your mouse over the options for more help. <text_editor type="string" - length="1" follows="left|top" left="10" height="75" @@ -116,7 +114,6 @@ Hover your mouse over the options for more help. <text follows="left|top" type="string" - length="1" font="SansSerifBig" tool_tip="Owners are shown in bold." height="16" @@ -151,7 +148,6 @@ Hover your mouse over the options for more help. follows="left|top" height="16" type="string" - length="1" top_pad="10" font="SansSerifBig" layout="topleft" @@ -161,7 +157,6 @@ Hover your mouse over the options for more help. <text follows="left|top" type="string" - length="1" height="16" layout="topleft" left_delta="0" diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index b85f1ed617..d24d11039a 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -42,7 +42,6 @@ --> <!-- <text type="string" - length="1" follows="left|top" font="SansSerifBig" height="16" @@ -98,7 +97,6 @@ enabled="false" /> <text type="string" - length="1" follows="left|top" halign="right" height="16" @@ -111,7 +109,6 @@ </text> <text type="string" - length="1" follows="left|top" height="16" layout="topleft" @@ -123,7 +120,6 @@ </text> <text type="string" - length="1" follows="left|top" halign="right" height="16" @@ -136,7 +132,6 @@ </text> <text type="string" - length="1" follows="left|top" height="16" layout="topleft" @@ -148,7 +143,6 @@ </text> <text type="string" - length="1" follows="left|top" halign="right" height="16" @@ -161,7 +155,6 @@ </text> <text type="string" - length="1" follows="left|top" height="16" layout="topleft" @@ -173,7 +166,6 @@ </text> <text type="string" - length="1" follows="left|top" halign="right" height="16" @@ -197,7 +189,6 @@ width="95" /> <text type="string" - length="1" follows="left|top" height="16" layout="topleft" @@ -208,7 +199,6 @@ </text> <text type="string" - length="1" follows="left|top" halign="right" height="16" @@ -231,7 +221,6 @@ <text follows="left|top" type="string" - length="1" word_wrap="true" font="SansSerifSmall" height="40" @@ -245,7 +234,6 @@ </text> <text type="string" - length="1" follows="left|top" font="SansSerifBig" height="16" @@ -277,7 +265,6 @@ width="265"> <text_editor type="string" - length="1" bg_readonly_color="0.784314 0.819608 0.8 1" follows="all" font="Monospace" @@ -303,7 +290,6 @@ width="265"> <text_editor type="string" - length="1" bg_readonly_color="0.784314 0.819608 0.8 1" follows="all" font="Monospace" @@ -349,7 +335,6 @@ width="265"> <text_editor type="string" - length="1" bg_readonly_color="0.784314 0.819608 0.8 1" follows="all" font="Monospace" diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index c4dc4fcea9..ffc2f279bc 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -35,7 +35,6 @@ the General tab. <!--<text follows="left|top" type="string" - length="1" font="SansSerifBig" height="16" layout="topleft" @@ -48,7 +47,6 @@ the General tab. <text follows="left|top" type="string" - length="1" word_wrap="true" height="40" layout="topleft" @@ -92,7 +90,6 @@ the General tab. <text follows="left|top" type="string" - length="1" layout="topleft" name="notice_list_none_found" visible="false"> @@ -132,7 +129,6 @@ the General tab. <text follows="left|top" type="string" - length="1" font="SansSerifBig" height="16" layout="topleft" @@ -147,7 +143,6 @@ the General tab. follows="left|top" type="string" word_wrap="true" - length="1" height="90" layout="topleft" left_delta="0" @@ -159,7 +154,6 @@ the General tab. <text follows="left|top" type="string" - length="1" halign="left" height="16" layout="topleft" @@ -182,7 +176,6 @@ the General tab. <text follows="left|top" type="string" - length="1" halign="left" height="16" layout="topleft" @@ -205,7 +198,6 @@ the General tab. <text follows="left|top" type="string" - length="1" halign="left" height="16" layout="topleft" @@ -292,7 +284,6 @@ the General tab. width="265"> <text type="string" - length="1" font="SansSerifBig" height="16" layout="topleft" @@ -305,7 +296,6 @@ the General tab. </text> <text type="string" - length="1" height="16" word_wrap="true" layout="topleft" @@ -317,7 +307,6 @@ the General tab. </text> <text type="string" - length="1" halign="left" height="16" layout="topleft" @@ -342,7 +331,6 @@ the General tab. width="200" /> <text type="string" - length="1" halign="left" height="16" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index c1d7393839..37c332b2b7 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -39,7 +39,6 @@ width="270"> <text type="string" - length="1" font="SansSerifBig" height="16" layout="topleft" @@ -51,7 +50,6 @@ </text> <text type="string" - length="1" word_wrap="true" height="40" layout="topleft" @@ -73,7 +71,6 @@ width="270"> <text type="string" - length="1" font="SansSerifBig" height="16" layout="topleft" @@ -85,7 +82,6 @@ </text> <text type="string" - length="1" word_wrap="true" height="40" layout="topleft" @@ -98,7 +94,6 @@ </text> <text type="string" - length="1" word_wrap="true" height="40" layout="topleft" @@ -110,7 +105,6 @@ </text> <text type="string" - length="1" word_wrap="true" height="16" layout="topleft" @@ -123,7 +117,6 @@ </text> <text type="string" - length="1" word_wrap="true" height="16" layout="topleft" @@ -145,7 +138,6 @@ width="270"> <text type="string" - length="1" font="SansSerifBig" height="16" layout="topleft" @@ -157,7 +149,6 @@ </text> <text type="string" - length="1" word_wrap="true" height="40" layout="topleft" @@ -525,7 +516,6 @@ things in this group. There's a broad variety of Abilities. width="265"> <text type="string" - length="1" font="SansSerif" height="16" layout="topleft" @@ -538,7 +528,6 @@ things in this group. There's a broad variety of Abilities. </text> <text type="string" - length="1" font="SansSerif" height="16" layout="topleft" @@ -599,7 +588,6 @@ things in this group. There's a broad variety of Abilities. width="270"> <text type="string" - length="1" font="SansSerif" height="16" layout="topleft" @@ -611,7 +599,6 @@ things in this group. There's a broad variety of Abilities. </text> <text type="string" - length="1" font="SansSerif" height="16" layout="topleft" @@ -623,7 +610,6 @@ things in this group. There's a broad variety of Abilities. </text> <line_editor type="string" - length="1" border_style="line" border_thickness="1" follows="left|top" @@ -638,7 +624,6 @@ things in this group. There's a broad variety of Abilities. </line_editor> <text type="string" - length="1" font="SansSerif" height="16" layout="topleft" @@ -650,7 +635,6 @@ things in this group. There's a broad variety of Abilities. </text> <line_editor type="string" - length="1" border_style="line" border_thickness="1" follows="left|top" @@ -665,7 +649,6 @@ things in this group. There's a broad variety of Abilities. </line_editor> <text_editor type="string" - length="1" halign="left" height="48" hide_scrollbar="true" @@ -680,7 +663,6 @@ things in this group. There's a broad variety of Abilities. </text_editor> <text type="string" - length="1" font="SansSerif" height="16" layout="topleft" @@ -692,7 +674,6 @@ things in this group. There's a broad variety of Abilities. </text> <text type="string" - length="1" font="SansSerif" height="16" layout="topleft" @@ -755,7 +736,6 @@ things in this group. There's a broad variety of Abilities. width="265"> <text type="string" - length="1" font="SansSerif" height="16" layout="topleft" @@ -767,7 +747,6 @@ things in this group. There's a broad variety of Abilities. </text> <text_editor type="string" - length="1" enabled="false" halign="left" height="48" @@ -783,7 +762,6 @@ things in this group. There's a broad variety of Abilities. </text_editor> <text type="string" - length="1" font="SansSerif" height="16" layout="topleft" @@ -795,7 +773,6 @@ things in this group. There's a broad variety of Abilities. </text> <text type="string" - length="1" font="SansSerif" height="16" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 1efe287cbe..a62d2a5cdb 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -93,7 +93,6 @@ name="bottom_panel" width="285"> <button - enabled="false" follows="bottom|left" font="SansSerifBigBold" height="18" @@ -101,7 +100,7 @@ image_unselected="OptionsMenu_Off" layout="topleft" left="20" - name="gear_btn" + name="nearby_view_sort_btn" picture_style="true" top="7" width="18" /> @@ -187,7 +186,6 @@ name="bottom_panel" width="285"> <button - enabled="false" follows="bottom|left" font="SansSerifBigBold" height="18" @@ -195,7 +193,7 @@ image_unselected="OptionsMenu_Off" layout="topleft" left="20" - name="gear_btn" + name="friends_viewsort_btn" picture_style="true" top="7" width="18" /> @@ -334,7 +332,6 @@ name="bottom_panel" width="285"> <button - enabled="false" follows="bottom|left" font="SansSerifBigBold" height="18" @@ -342,7 +339,7 @@ image_unselected="OptionsMenu_Off" layout="topleft" left="20" - name="gear_btn" + name="recent_viewsort_btn" picture_style="true" top="7" width="18" /> diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 0075eef9ef..33592d289f 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -13,10 +13,10 @@ font="SansSerifHugeBold" height="15" layout="topleft" - left="0" + left="10" name="title" text_color="white" - top="0" + top="5" value="Pick Info" width="150" /> <button @@ -26,13 +26,14 @@ layout="topleft" name="back_btn" picture_style="true" - right="-25" - top="10" + right="-20" + top="7" width="20" /> <panel background_visible="true" bg_alpha_color="DkGray2" follows="left|right|top|bottom" + height="550" layout="topleft" left="0" min_height="300" @@ -46,7 +47,7 @@ left="10" name="pick_snapshot" top="10" - width="260" /> + width="245" /> <text follows="left|top" font="SansSerifBigBold" @@ -111,10 +112,10 @@ value="[loading...]" /> </panel> <panel - bottom="660" follows="left|right|bottom" height="30" layout="topleft" + top_pad="2" left="8" name="buttons" right="-10"> @@ -134,6 +135,7 @@ height="25" label="Teleport" layout="topleft" + left_pad="2" name="teleport_btn" top="0" width="80" /> @@ -143,6 +145,7 @@ height="25" label="Show on Map" layout="topleft" + left_pad="2" name="show_on_map_btn" top="0" width="100" /> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index d00ff7a6a1..65db3cc7a1 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -72,7 +72,7 @@ top="0" left="0" width="240" - height="500"> + height="520"> <panel follows="left|top" @@ -251,6 +251,41 @@ width="40" /> </panel> <text + type="string" + follows="left|top" + font="SansSerifBold" + height="15" + halign="right" + layout="topleft" + left="10" + name="online_me_status_text" + text_color="white" + top_pad="20" + width="100"> + Status: + </text> + <combo_box + font="SansSerifBold" + height="18" + layout="topleft" + left_pad="0" + top_delta="0" + name="status_combo" + width="100"> + <combo_box.item + label="Online" + name="online" + value="online" /> + <combo_box.item + label="Away" + name="away" + value="away" /> + <combo_box.item + label="Busy" + name="busy" + value="busy" /> + </combo_box> + <text follows="left|top" font="SansSerifBold" halign="right" diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index 4f8adf6ecb..e9eac2c9dc 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -2,7 +2,6 @@ <side_tray name="sidebar" background_visible="false" - color="DkGray" mouse_opaque="true" width="305" collapsed="true" @@ -15,7 +14,6 @@ mouse_opaque="false" background_opaque="false" background_visible="true" -color="DkGray" > <panel name="panel_home" @@ -34,7 +32,6 @@ color="DkGray" mouse_opaque="false" background_opaque="false" background_visible="true" -color="DkGray" > <panel_container name="panel_container" @@ -71,7 +68,6 @@ color="DkGray" image="TabIcon_Places_Off" mouse_opaque="false" background_visible="true" - color="DkGray" > <panel class="panel_places" @@ -89,7 +85,6 @@ color="DkGray" image="TabIcon_Me_Off" mouse_opaque="false" background_visible="true" - color="DkGray" > <panel class="panel_me_profile_view" diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml index aef3363259..d7736832a3 100644 --- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<filter_editor select_on_focus="true"
- background="TextField_Search_Off"
background_image_disabled="TextField_Search_Disabled"
background_image_focused="TextField_Search_Active">
<clear_filter_button label=""
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 777651c452..89a88330c7 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -9,7 +9,6 @@ <location_input font="SansSerifSmall" add_landmark_image_enabled="Favorite_Star_Active" add_landmark_image_disabled="Favorite_Star_Off" - hover_glow_amount="0.15" add_landmark_hpad="2" allow_text_entry="true" list_position="below" |