diff options
8 files changed, 174 insertions, 190 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml index af4fdff044..6050aede79 100644 --- a/indra/newview/skins/default/xui/en/floater_select_key.xml +++ b/indra/newview/skins/default/xui/en/floater_select_key.xml @@ -4,30 +4,31 @@ border="false" can_close="false" can_minimize="false" - height="100" + height="90" layout="topleft" name="modal container" width="240"> - <button - height="20" - label="Cancel" - label_selected="Cancel" - layout="topleft" - left="138" - name="Cancel" - top="70" - width="82" /> <text type="string" + halign="center" length="1" follows="left|top" - font="SansSerif" - height="16" + height="30" layout="topleft" - left="20" + left="10" name="Save item as:" - top="10" - width="200"> - Press a key to select + top="25" + word_wrap="true" + width="220"> + Press a key to set your +Speak button toggle </text> + <button + height="23" + label="Cancel" + label_selected="Cancel" + layout="topleft" + right="-10" + name="Cancel" + width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml index 374f014908..bb463edd4d 100644 --- a/indra/newview/skins/default/xui/en/floater_telehub.xml +++ b/indra/newview/skins/default/xui/en/floater_telehub.xml @@ -6,7 +6,7 @@ name="telehub" help_topic="telehub" title="TELEHUB" - width="280"> + width="330"> <text type="string" length="1" @@ -16,7 +16,7 @@ left="10" name="status_text_connected" top="24" - width="200"> + width="315"> Telehub connected to object [OBJECT] </text> <text @@ -28,7 +28,7 @@ left_delta="0" name="status_text_not_connected" top_delta="0" - width="200"> + width="315"> No telehub connected. </text> <text @@ -40,7 +40,7 @@ left_delta="0" name="help_text_connected" top_delta="16" - width="260"> + width="315"> To remove, click Disconnect. </text> <text @@ -52,78 +52,73 @@ left_delta="0" name="help_text_not_connected" top_delta="0" - width="260"> + width="315"> Select object and click Connect Telehub. </text> <button follows="top|left" - height="20" + height="23" label="Connect Telehub" layout="topleft" left_delta="0" name="connect_btn" top_delta="20" - width="110" /> + width="130" /> <button follows="top|left" - height="20" + height="23" label="Disconnect" layout="topleft" left_pad="10" name="disconnect_btn" top_delta="0" - width="110" /> + width="130" /> <text type="string" length="1" follows="left|top" - height="16" + height="14" layout="topleft" left="10" name="spawn_points_text" top="84" - width="200"> + width="315"> Spawn Points (positions, not objects): </text> <scroll_list follows="left|top" height="60" layout="topleft" - left_delta="0" name="spawn_points_list" - top_delta="16" - width="230" /> + width="315" /> <button follows="top|left" - height="20" + height="23" label="Add Spawn" layout="topleft" - left_delta="0" name="add_spawn_point_btn" - top_pad="5" - width="110" /> + width="130" /> <button follows="top|left" - height="20" + height="23" label="Remove Spawn" layout="topleft" left_pad="10" name="remove_spawn_point_btn" - top_delta="0" - width="110" /> + width="130" /> <text type="string" length="1" follows="top|left" - height="80" + height="56" layout="topleft" left="10" name="spawn_point_help" - top="190" - width="260"> - Select object and click Add to specify position. -You may then move or delete the object. + word_wrap="true" + width="317"> + Select object and click "Add Spawn" to specify position. +You can then move or delete the object. Positions are relative to the telehub center. -Select item in list to show position in world. +Select an item in list to highlight it inworld. </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index d2db26daec..68bb500c78 100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -8,7 +8,7 @@ min_width="450" name="top_objects" help_topic="top_objects" - title="LOADING..." + title="Top Objects" width="550"> <floater.string name="top_scripts_title"> @@ -46,24 +46,24 @@ type="string" length="1" follows="left|top" - font="SansSerif" height="20" layout="topleft" left="10" name="title_text" - top="30" + top="20" + text_color="EmphasisColor" width="400"> Loading... </text> <scroll_list draw_heading="true" - follows="left|top|bottom|right" - height="150" + follows="all" + height="170" layout="topleft" left_delta="0" multi_select="true" name="objects_list" - top_delta="20" + top_delta="17" width="530"> <scroll_list.columns label="Score" @@ -109,16 +109,16 @@ follows="left|bottom|right" height="20" layout="topleft" - left_delta="70" + left_pad="3" name="id_editor" top_delta="-3" - width="350" /> + width="325" /> <button follows="bottom|right" - height="20" + height="23" label="Show Beacon" layout="topleft" - left_pad="10" + left_pad="5" name="show_beacon_btn" top_delta="0" width="100"> @@ -132,25 +132,25 @@ height="20" layout="topleft" left="10" + top_pad="5" name="obj_name_text" - top="237" width="100"> - Object Name: + Object name: </text> <line_editor follows="left|bottom|right" height="20" layout="topleft" - left_delta="70" + left_pad="3" name="object_name_editor" top_delta="-3" - width="350" /> + width="325" /> <button follows="bottom|right" - height="20" + height="23" label="Filter" layout="topleft" - left_pad="10" + left_pad="5" name="filter_object_btn" top_delta="0" width="100"> @@ -164,25 +164,25 @@ height="20" layout="topleft" left="10" + top_pad="5" name="owner_name_text" - top="264" width="100"> - Owner Name: + Owner: </text> <line_editor follows="left|bottom|right" height="20" layout="topleft" - left_delta="70" + left_pad="3" name="owner_name_editor" top_delta="-3" - width="350" /> + width="325" /> <button follows="bottom|right" - height="20" + height="23" label="Filter" layout="topleft" - left_pad="10" + left_pad="5" name="filter_owner_btn" top_delta="0" width="100"> @@ -190,20 +190,32 @@ function="TopObjects.GetByOwnerName" /> </button> <button + follows="top|left" + height="22" + image_overlay="Refresh_Off" + layout="topleft" + name="refresh_btn" + right="-8" + top_pad="5" + width="23"> + <button.commit_callback + function="TopObjects.Refresh" /> + </button> + <button follows="bottom|left" - height="20" + height="23" label="Return Selected" layout="topleft" - left="10" + left="112" + top_delta="0" name="return_selected_btn" - top="295" width="130"> <button.commit_callback function="TopObjects.ReturnSelected" /> </button> <button follows="bottom|left" - height="20" + height="23" label="Return All" layout="topleft" left_pad="10" @@ -215,19 +227,19 @@ </button> <button follows="bottom|left" - height="20" + height="23" label="Disable Selected" layout="topleft" - left="10" + + left="112" name="disable_selected_btn" - top="320" width="130"> <button.commit_callback function="TopObjects.DisableSelected" /> </button> <button follows="bottom|left" - height="20" + height="23" label="Disable All" layout="topleft" left_pad="10" @@ -237,16 +249,4 @@ <button.commit_callback function="TopObjects.DisableAll" /> </button> - <button - bottom="315" - follows="bottom|right" - height="20" - label="Refresh" - layout="topleft" - name="refresh_btn" - right="-10" - width="100"> - <button.commit_callback - function="TopObjects.Refresh" /> - </button> </floater> diff --git a/indra/newview/skins/default/xui/en/inspect_remote_object.xml b/indra/newview/skins/default/xui/en/inspect_remote_object.xml index b5f2abf52a..ef3dd844cd 100644 --- a/indra/newview/skins/default/xui/en/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_remote_object.xml @@ -6,10 +6,10 @@ <floater legacy_header_height="18" bevel_style="in" - bg_opaque_image="Inspector_Background" + bg_opaque_image="Inspector_Background" can_close="false" can_minimize="false" - height="145" + height="130" layout="topleft" name="inspect_remote_object" single_instance="true" @@ -18,79 +18,78 @@ width="300"> <text follows="all" - font="SansSerifLargeBold" - height="16" + font="SansSerifLarge" + font_style="BOLD" + height="30" left="8" name="object_name" text_color="White" top="5" use_ellipses="true" - width="290"> - Test Object Name That Is Really Long + word_wrap="true" + width="291"> + Test Object Name That Is Really Long OMG so long I can't believe how long the name of this object is, I mean really. </text> <text - follows="all" - font="SansSerif" - height="20" + follows="top|left" + font="SansSerifSmall" + height="16" left="8" name="object_owner_label" width="55" - top_pad="20"> + top_pad="12"> Owner: </text> <text follows="top|left" - font="SansSerif" - height="20" - left_pad="10" + height="16" + left_pad="5" name="object_owner" use_ellipses="true" - width="200" + width="230" word_wrap="false"> Longavatarname Johnsonlongstonnammer </text> - <text + <!--<text follows="top|left" - font="SansSerif" - height="20" + height="16" left="8" name="object_slurl_label" - top_pad="10" + top_pad="5" width="55"> Location: - </text> + </text>--> <text follows="top|left" - height="20" - left_pad="10" + height="16" + left="8" name="object_slurl" - width="240" + width="290" use_ellipses="true" word_wrap="false"> http://slurl.com/Ahern/50/50/50 </text> <button follows="top|left" - height="20" + height="23" label="Map" - left="10" + left="8" + top_pad="8" name="map_btn" - top="114" - width="75" /> + width="90" /> <button follows="top|left" - height="20" + height="23" label="Block" - left_pad="5" + left_pad="8" name="block_btn" - top_delta="0" - width="75" /> + width="90" /> <button follows="top|left" - height="20" + height="23" label="Close" - right="-10" + right="-8" name="close_btn" - top_delta="0" - width="75" /> + left_pad="5" + width="90" /> </floater> diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml index 3842c2a8db..970a2e6a8a 100644 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -8,31 +8,31 @@ min_height="350" min_width="240" width="280"> - <text + <button + follows="top|left" + height="25" + image_overlay="BackArrow_Off" + layout="topleft" + name="back" + left="10" + tab_stop="false" + top="0" + width="25"/> + <text follows="top|left|right" - font="SansSerifHugeBold" + font="SansSerifLargeBold" height="20" layout="topleft" - left="10" + left_pad="10" name="title_text" text_color="white" - top="0" + top="5" width="250"> Blocked List </text> - <button - follows="top|right" - height="25" - image_overlay="BackArrow_Off" - layout="topleft" - name="back" - right="-9" - tab_stop="false" - top="0" - width="25"/> <scroll_list - follows="left|top|right|bottom" - height="200" + follows="all" + height="190" layout="topleft" left="5" name="blocked" @@ -41,9 +41,8 @@ width="270" /> <button follows="left|bottom" - height="20" - label="Block Resident..." - label_selected="Block Resident..." + height="23" + label="Block person" layout="topleft" left_delta="0" name="Block resident..." @@ -55,9 +54,8 @@ </button> <button follows="left|bottom" - height="20" - label="Block object by name..." - label_selected="Block object by name..." + height="23" + label="Block object by name" layout="topleft" left_delta="0" name="Block object by name..." @@ -70,9 +68,8 @@ <button enabled="false" follows="left|bottom" - height="20" + height="23" label="Unblock" - label_selected="Unblock" layout="topleft" left_delta="0" name="Unblock" diff --git a/indra/newview/skins/default/xui/en/panel_friends.xml b/indra/newview/skins/default/xui/en/panel_friends.xml index 3a35465df2..ac731bcdf0 100644 --- a/indra/newview/skins/default/xui/en/panel_friends.xml +++ b/indra/newview/skins/default/xui/en/panel_friends.xml @@ -8,7 +8,7 @@ width="100"> <panel.string name="Multiple"> - Multiple friends... + Multiple friends </panel.string> <scroll_list bottom="337" @@ -84,7 +84,7 @@ <button follows="top|right" height="22" - label="Teleport..." + label="Teleport" layout="topleft" left_delta="0" name="offer_teleport_btn" @@ -94,7 +94,7 @@ <button follows="top|right" height="22" - label="Pay..." + label="Pay" layout="topleft" left_delta="0" name="pay_btn" @@ -104,7 +104,7 @@ <button follows="top|right" height="22" - label="Remove..." + label="Remove" layout="topleft" left_delta="0" name="remove_btn" @@ -114,7 +114,7 @@ <button follows="top|right" height="22" - label="Add..." + label="Add" layout="topleft" left_delta="0" name="add_btn" diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml index 889f29fc53..a5445a5783 100644 --- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml @@ -1,14 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel border="false" - follows="left|top|right|bottom" + follows="all" height="238" name="panel_im_control_panel" width="180"> - <avatar_list color="DkGray2" - follows="left|top|right|bottom" + follows="all" height="100" ignore_online_status="true" layout="topleft" @@ -19,20 +18,18 @@ show_profile_btn="false" show_speaking_indicator="false" top="10" - width="180"/> - + width="180" /> <button bottom_pad="0" - follows="left|right|bottom" - height="20" - label="Group Info" + follows="left|right|bottom" + height="23" + label="Group Profile" left_delta="28" name="group_info_btn" - width="125"/> - + width="125" /> <panel background_visible="true" - bg_alpha_color="0.2 0.2 0.2 1" + bg_alpha_color="DkGray2" border="false" follows="left|right|bottom" height="70" @@ -41,34 +38,29 @@ name="panel_call_buttons" top_pad="0" width="180"> - <button bottom="10" - follows="all" - height="20" + follows="all" + height="23" label="Call Group" left_delta="28" name="call_btn" - width="125"/> - + width="125" /> <button bottom="40" - follows="all" - height="20" + follows="all" + height="23" label="Leave Call" name="end_call_btn" visible="false" - width="125"/> - + width="125" /> <button bottom="10" - follows="all" - height="20" + follows="all" + height="23" label="Open Voice Controls" name="voice_ctrls_btn" visible="false" - width="125"/> - + width="125" /> </panel> - </panel> diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml index 3c87331199..d51893793c 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -27,7 +27,7 @@ <string name="no_partner_text" value="None" /> - <string + <string name="RegisterDateFormat"> [REG_DATE] ([AGE]) </string> @@ -156,8 +156,8 @@ Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. </expandable_text> </panel> - - + + <!-- <panel name="lifes_images_panel" follows="left|top|right" @@ -207,10 +207,10 @@ top="25" width="18" /> </panel> --> - - - - + + + + <text type="string" follows="left|top" @@ -254,7 +254,7 @@ layout="topleft" left="10" name="register_date" - value="05/31/1976" + value="05/31/2376" width="280" word_wrap="true" /> <text @@ -351,11 +351,11 @@ name="profile_buttons_panel" top_pad="2" bottom="10" - height="19" + height="23" width="303"> <button follows="bottom|left" - height="19" + height="23" label="Add Friend" layout="topleft" left="0" @@ -365,7 +365,7 @@ width="75" /> <button follows="bottom|left" - height="19" + height="23" label="IM" layout="topleft" name="im" @@ -374,7 +374,7 @@ width="45" /> <button follows="bottom|left" - height="19" + height="23" label="Call" layout="topleft" name="call" @@ -384,7 +384,7 @@ <button enabled="false" follows="bottom|left" - height="19" + height="23" label="Map" layout="topleft" name="show_on_map_btn" @@ -393,7 +393,7 @@ width="45" /> <button follows="bottom|left" - height="19" + height="23" label="Teleport" layout="topleft" name="teleport" @@ -408,11 +408,11 @@ top_pad="-17" name="profile_me_buttons_panel" visible="false" - height="19" + height="23" width="303"> <button follows="bottom|right" - height="19" + height="23" left="10" label="Edit Profile" name="edit_profile_btn" @@ -420,7 +420,7 @@ width="130" /> <button follows="bottom|right" - height="19" + height="23" label="Edit Appearance" left_pad="10" name="edit_appearance_btn" |