diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
56 files changed, 3799 insertions, 1815 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index dee5e29a3c..4678d65b85 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1893,7 +1893,29 @@ Only large parcels can be listed in search. left="110" name="parcel_enable_voice_channel_local" width="300" /> - </panel> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + mouse_opaque="false" + name="media" + top_pad="10" + width="100"> + Media: + </text> + <check_box + height="16" + label="Obscure MOAP" + layout="topleft" + left="110" + left_pad="0" + name="obscure_moap" + tool_tip="Media on a prim located outside the parcel should not play automatically for an agent within this parcel and vice versa." + width="300" /> + </panel> <panel border="true" follows="all" diff --git a/indra/newview/skins/default/xui/en/floater_picks.xml b/indra/newview/skins/default/xui/en/floater_classified.xml index 984894b016..5b14c827d0 100644 --- a/indra/newview/skins/default/xui/en/floater_picks.xml +++ b/indra/newview/skins/default/xui/en/floater_classified.xml @@ -2,20 +2,19 @@ <floater positioning="cascading" can_close="true" - can_resize="true" + can_resize="false" height="572" help_topic="sidebar_me" min_width="333" min_height="440" - name="floater_picks" + name="floater_classified" save_rect="true" - save_visibility="true" - reuse_instance="true" - title="Picks" + save_visibility="false" + title="Classified" width="333" > <panel - class="panel_me" + class="panel_classified_info" name="main_panel" - filename="panel_me.xml" + filename="panel_classified_info.xml" follows="all"/> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_create_landmark.xml b/indra/newview/skins/default/xui/en/floater_create_landmark.xml index bba30626b2..632daaec7e 100644 --- a/indra/newview/skins/default/xui/en/floater_create_landmark.xml +++ b/indra/newview/skins/default/xui/en/floater_create_landmark.xml @@ -88,6 +88,7 @@ spellcheck="true" text_readonly_color="white" text_type="ascii_with_newline" + commit_on_focus_lost="true" top_pad="5" width="290" wrap="true" /> diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml index 9a9fd32a77..3c8f415860 100644 --- a/indra/newview/skins/default/xui/en/floater_display_name.xml +++ b/indra/newview/skins/default/xui/en/floater_display_name.xml @@ -23,7 +23,7 @@ use_ellipses="true" width="380" wrap="true"> - The name you give your avatar is called your Display Name. You can change it once a week. + Your display name is what other people see above your head. It is different from your login name. You can change it once a week. </text> <text type="string" @@ -85,19 +85,10 @@ width="120" /> <button height="23" - label="Reset" - layout="topleft" - font="SansSerif" - left_pad="5" - name="reset_btn" - tool_tip="Make Display Name the same as Username" - width="120" /> - <button - height="23" label="Cancel" font="SansSerif" layout="topleft" - left_pad="5" + left_pad="125" name="cancel_btn" width="120" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index b8893e11d9..9639e70544 100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml @@ -16,11 +16,35 @@ width="200"> <floater.string name="ToolTipMsg"> - [REGION](Double-click to open Map, shift-drag to pan) + [PARCEL_NAME_MSG][PARCEL_SALE_PRICE_MSG][PARCEL_SALE_AREA_MSG][PARCEL_OWNER_MSG][REGION_NAME_MSG][TOOL_TIP_HINT_MSG] + </floater.string> + <floater.string + name="ParcelNameMsg"> + [PARCEL_NAME] + </floater.string> + <floater.string + name="ParcelSalePriceMsg"> + Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²) + </floater.string> + <floater.string + name="ParcelSaleAreaMsg"> + Area: [AREA]m² + </floater.string> + <floater.string + name="ParcelOwnerMsg"> + Owner: [PARCEL_OWNER] + </floater.string> + <floater.string + name="RegionNameMsg"> + Region: [REGION_NAME] </floater.string> <floater.string - name="AltToolTipMsg"> - [REGION](Double-click to teleport, shift-drag to pan) + name="ToolTipHintMsg"> + Double-click to open map + </floater.string> + <floater.string + name="AltToolTipHintMsg"> + Double-click to teleport </floater.string> <floater.string name="mini_map_caption"> Mini-map @@ -37,105 +61,73 @@ <text type="string" length="1" - bottom="218" label="N" layout="topleft" - left="0" name="floater_map_north" - right="10" - text_color="1 1 1 0.7" - top="189"> + text_color="1 1 1 0.7"> N </text> <text type="string" length="1" - bottom="218" label="E" layout="topleft" - left="0" name="floater_map_east" - right="10" - text_color="1 1 1 0.7" - top="189"> + text_color="1 1 1 0.7"> E </text> <text type="string" length="1" - bottom="205" label="W" layout="topleft" - left="0" name="floater_map_west" - right="11" - text_color="1 1 1 0.7" - top="175"> + text_color="1 1 1 0.7"> W </text> <text type="string" length="1" - bottom="218" label="S" layout="topleft" - left="0" name="floater_map_south" - right="10" - text_color="1 1 1 0.7" - top="189"> + text_color="1 1 1 0.7"> S </text> <text type="string" length="1" - bottom="218" label="SE" layout="topleft" - left="0" name="floater_map_southeast" - right="20" - text_color="1 1 1 0.7" - top="189"> + text_color="1 1 1 0.7"> SE </text> <text type="string" length="1" - bottom="218" label="NE" layout="topleft" - left="0" name="floater_map_northeast" - right="20" - text_color="1 1 1 0.7" - top="189"> + text_color="1 1 1 0.7"> NE </text> <text type="string" length="1" - bottom="218" label="SW" layout="topleft" - left="0" name="floater_map_southwest" - right="20" - text_color="1 1 1 0.7" - top="189"> + text_color="1 1 1 0.7"> SW </text> <text type="string" length="1" - bottom="218" label="NW" layout="topleft" - left="0" name="floater_map_northwest" - right="20" - text_color="1 1 1 0.7" - top="189"> + text_color="1 1 1 0.7"> NW </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index e499ddbc2f..21c894d3af 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -830,6 +830,7 @@ <combo_item name="physics_medium"> Medium </combo_item> <combo_item name="physics_low"> Low </combo_item> <combo_item name="physics_lowest"> Lowest </combo_item> + <combo_item name="physics_bounding_box"> Bounding Box </combo_item> <combo_item name="load_from_file"> From file </combo_item> </combo_box> <line_editor diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index e1e7e1c8c8..048cf7df62 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -17,94 +17,122 @@ name="Copy"> Copy To Inventory </floater.string> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="19" - layout="topleft" - left="10" - name="desc txt" - top="21" - width="90"> - Description: - </text> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - font="SansSerif" - height="19" - layout="topleft" - left_pad="0" - max_length_bytes="127" - name="desc" - width="190" /> - <text - type="string" - halign="right" - length="1" - follows="right|bottom" - height="16" - layout="topleft" - left="110" - name="dimensions" - top="255" - width="200"> - [WIDTH]px x [HEIGHT]px - </text> - <text - type="string" - halign="right" - length="1" - follows="right|bottom" - height="16" - layout="topleft" - left_delta="-110" - name="aspect_ratio" - top_pad="5" - width="200"> - Preview aspect ratio - </text> - <combo_box - allow_text_entry="true" - top_delta="-3" - follows="right|bottom" - height="23" - left_pad="10" - max_chars="20" - mouse_opaque="true" - enabled="true" - width="108" - name="combo_aspect_ratio" - tool_tip="Preview at a fixed aspect ratio"> - </combo_box> - <button - follows="right|bottom" - height="22" - label="OK" - layout="topleft" - left="6" - name="Keep" - top_pad="5" - width="110" /> - <button - follows="right|bottom" - height="22" - label="Discard" - layout="topleft" - left_pad="5" - name="Discard" - top_delta="0" - width="110" /> - <button - follows="right|bottom" - height="22" - label="Save As" - layout="topleft" - left_pad="5" - name="save_tex_btn" - top_delta="0" - width="110" /> + <layout_stack + animate="false" + name="preview_stack" + top_pad="15" + left="0" + follows="all" + orientation="vertical" + height="350" + width="370" + layout="topleft"> + <layout_panel + name="texture_panel" + height="305" + top_pad="0" + left="0" + follows="left|top" + layout="topleft"> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="19" + layout="topleft" + left="10" + name="desc txt" + top="6" + width="90"> + Description: + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + font="SansSerif" + height="19" + layout="topleft" + left_pad="0" + max_length_bytes="127" + name="desc" + width="190" /> + <text + type="string" + halign="right" + length="1" + follows="right|bottom" + height="16" + layout="topleft" + left="110" + name="dimensions" + bottom="-40" + width="200"> + [WIDTH]px x [HEIGHT]px + </text> + <text + type="string" + halign="right" + length="1" + follows="right|bottom" + height="16" + layout="topleft" + left_delta="-110" + name="aspect_ratio" + top_pad="5" + width="200"> + Preview aspect ratio + </text> + <combo_box + allow_text_entry="true" + top_delta="-3" + follows="right|bottom" + height="23" + left_pad="10" + max_chars="20" + mouse_opaque="true" + enabled="true" + width="108" + name="combo_aspect_ratio" + tool_tip="Preview at a fixed aspect ratio"> + </combo_box> + </layout_panel> + <layout_panel + name="buttons_panel" + height="45" + bottom="-40" + left="0" + follows="right|bottom" + auto_resize="false" + layout="topleft"> + <button + follows="right|bottom" + height="22" + label="OK" + layout="topleft" + left="6" + name="Keep" + top_pad="0" + width="110" /> + <button + follows="right|bottom" + height="22" + label="Discard" + layout="topleft" + left_pad="5" + name="Discard" + top_delta="0" + width="110" /> + <button + follows="right|bottom" + height="22" + label="Save As" + layout="topleft" + left_pad="5" + name="save_tex_btn" + top_delta="0" + width="110" /> + </layout_panel> + </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml new file mode 100644 index 0000000000..32ab811a6e --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_profile.xml @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater + name="avatarinfo" + height="510" + width="510" + layout="topleft" + can_close="true" + can_resize="true" + help_topic="panel_my_profile_tab" + min_height="510" + min_width="510" + positioning="centered" + save_rect="true" + title="Profile" +> + <panel + name="panel_profile_view" + top="0" + left="0" + height="500" + width="505" + follows="all" + class="panel_profile" + > + <tab_container + name="panel_profile_tabs" + top_pad="5" + left="0" + height="500" + width="505" + follows="all" + layout="topleft" + halign="center" + tab_min_width="81" + tab_height="30" + tab_position="top" + > + <panel + name="panel_profile_secondlife" + label="BIO" + layout="topleft" + class="panel_profile_secondlife" + filename="panel_profile_secondlife.xml" + help_topic="profile_secondlife_tab" + /> + <panel + name="panel_profile_web" + label="FEED" + layout="topleft" + class="panel_profile_web" + filename="panel_profile_web.xml" + help_topic="profile_web_tab" + /> + <panel + name="panel_profile_picks" + label="PICKS" + layout="topleft" + class="panel_profile_picks" + filename="panel_profile_picks.xml" + help_topic="profile_picks_tab" + /> + <panel + name="panel_profile_classifieds" + label="CLASSIFIEDS" + layout="topleft" + class="panel_profile_classifieds" + filename="panel_profile_classifieds.xml" + help_topic="profile_classified_tab" + /> + <panel + name="panel_profile_firstlife" + label="REAL LIFE" + layout="topleft" + class="panel_profile_firstlife" + filename="panel_profile_firstlife.xml" + help_topic="profile_firstlife_tab" + /> + <panel + name="panel_profile_notes" + label="MY NOTES" + layout="topleft" + class="panel_profile_notes" + filename="panel_profile_notes.xml" + help_topic="profile_notes_tab" + /> + </tab_container> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_profile_permissions.xml b/indra/newview/skins/default/xui/en/floater_profile_permissions.xml new file mode 100644 index 0000000000..9f3b4d9a00 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_profile_permissions.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_resize="false" + show_title="false" + can_minimize="false" + can_close="false" + header_height="10" + bg_opaque_image="Window_NoTitle_Foreground" + bg_alpha_image="Window_NoTitle_Background" + height="115" + layout="topleft" + name="profile_permissions" + width="300"> + <string + name="description_string" + value="Allow [AGENT_NAME] to:" /> + <text + name="perm_description" + value="Allow agent to:" + top="1" + left="12" + right="-6" + height="16" + follows="top|left" + layout="topleft" + font.style="BOLD" + /> + <check_box + name="online_check" + label="See when I am online" + top_pad="5" + left="16" + height="16" + width="293" + follows="top|left" + layout="topleft" + /> + <check_box + name="map_check" + label="Find me on the world map" + top_pad="5" + left="16" + height="16" + width="293" + follows="top|left" + layout="topleft" + /> + <check_box + name="objects_check" + label="Edit, delete or take my objects from my land" + top_pad="5" + left="16" + height="16" + width="293" + follows="top|left" + layout="topleft" + /> + <button + name="perms_btn_ok" + label="OK" + top_pad="5" + left="42" + height="20" + width="100" + follows="top|left" + layout="topleft"/> + <button + name="perms_btn_cancel" + label="Cancel" + top_delta="0" + left_pad="12" + height="20" + width="100" + follows="top|left" + layout="topleft"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_profile_texture.xml b/indra/newview/skins/default/xui/en/floater_profile_texture.xml new file mode 100644 index 0000000000..3b351a3325 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_profile_texture.xml @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_resize="false" + show_title="false" + can_minimize="false" + can_close="false" + header_height="10" + height="223" + width="200" + layout="topleft" + min_height="128" + min_width="128" + name="profile_texture"> + <layout_stack + name="preview_stack" + top="0" + left="0" + right="-1" + bottom="-1" + follows="all" + orientation="vertical" + layout="topleft" + animate="false"> + <layout_panel + name="texture_panel" + height="196" + follows="left|top" + auto_resize="true" + layout="topleft"> + <icon + name="profile_pic" + image_name="Generic_Person_Large" + layout="topleft" + follows="all" + top="5" + left="5" + bottom="-1" + right="-5"/> + </layout_panel> + <layout_panel + name="buttons_panel" + height="26" + auto_resize="false" + layout="topleft"> + <layout_stack + name="buttons_stack" + top="0" + left="0" + right="-1" + bottom="-1" + follows="all" + orientation="horizontal" + layout="topleft" + animate="false"> + <layout_panel + follows="all" + layout="topleft" + name="resizer_left" + auto_resize="true" + width="1"> + </layout_panel> + <layout_panel + follows="all" + layout="topleft" + name="close_panel" + auto_resize="false" + width="112"> + <button + follows="top|left" + height="22" + label="Close" + layout="topleft" + left="1" + top="0" + width="110" + name="close_btn"/> + </layout_panel> + <layout_panel + follows="all" + layout="topleft" + name="resizer_right" + auto_resize="true" + width="1"> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml index d07e3cb31b..343e72f057 100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml @@ -11,6 +11,11 @@ name="Screenshot"> Screenshot </floater.string> + <floater.string + name="chat_report_format"> +Time: [MSG_TIME] +Text: [MSG_DESCRIPTION] + </floater.string> <texture_picker allow_no_texture="true" default_image_name="None" @@ -19,7 +24,7 @@ layout="topleft" left="60" name="screenshot" - top="15" + top="20" width="220" /> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 0abee2ff80..ade79b8884 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2,7 +2,7 @@ <floater positioning="cascading" legacy_header_height="18" - height="600" + height="609" layout="topleft" bg_opaque_image="Window_NoTitle_Foreground" bg_alpha_image="Window_NoTitle_Background" @@ -68,7 +68,7 @@ </floater.string> <floater.string name="status_selectcount"> - [OBJ_COUNT] objects selected, land impact [LAND_IMPACT] + [OBJ_COUNT] objects selected, land impact [LAND_IMPACT] [secondlife:///app/openfloater/object_weights More info] </floater.string> <floater.string name="status_remaining_capacity"> @@ -763,11 +763,12 @@ font="SansSerifSmall" layout="topleft" left="10" - name="selection_count" + name="selection_faces" top_delta="0" visible="false" width="280"> - </text> + Faces selected: [FACES_STRING] + </text> <text text_color="LtGray_50" type="string" @@ -777,11 +778,10 @@ font="SansSerifSmall" layout="topleft" left="10" - name="remaining_capacity" + name="selection_count" top_pad="0" visible="false" width="280"> - [CAPACITY_STRING] [secondlife:///app/openfloater/object_weights More info] </text> <!-- <text --> <!-- text_color="LtGray_50" --> @@ -820,7 +820,7 @@ width="282"/> <tab_container follows="left|top" - height="410" + height="426" halign="center" left="0" name="Object Info Tabs" @@ -1430,16 +1430,40 @@ even though the user gets a free copy. tool_tip="Causes object to not collide with other objects or avatars" top_pad="0" width="123" /> - <text + <view_border + bevel_style="none" + follows="top|left" + height="0" + layout="topleft" + left_delta="0" + name="object_horizontal" + top_pad="10" + width="95" /> + <menu_button + menu_filename="menu_copy_paste_pos.xml" + follows="top|left" + height="11" + image_disabled="ClipboardSmallMenu_Disabled" + image_selected="ClipboardSmallMenu_Press" + image_unselected="ClipboardSmallMenu_Off" + layout="topleft" + left_delta="0" + top_pad="13" + name="clipboard_pos_btn" + tool_tip="Paste options" + width="19"/> + <text type="string" length="1" follows="left|top" height="10" layout="topleft" name="label position" - top_pad="10" + tool_tip="Position (meters)" + left_pad="8" + top_delta="0" width="121"> - Position (meters) + Position (m) </text> <spinner follows="left|top" @@ -1449,12 +1473,12 @@ even though the user gets a free copy. label="X" label_width="10" layout="topleft" - left_delta="0" + left_delta="-27" max_val="512" min_val="-256" name="Pos X" text_enabled_color="1 0 0.3 .7" - top_pad="5" + top_pad="8" width="87" /> <spinner follows="left|top" @@ -1481,21 +1505,36 @@ even though the user gets a free copy. layout="topleft" left_delta="0" max_val="4096" + min_val="-32" name="Pos Z" text_enabled_color="0 0.8 1 .65" top_pad="3" width="87" /> + <menu_button + menu_filename="menu_copy_paste_size.xml" + follows="top|left" + height="11" + image_disabled="ClipboardSmallMenu_Disabled" + image_selected="ClipboardSmallMenu_Press" + image_unselected="ClipboardSmallMenu_Off" + layout="topleft" + left_delta="0" + top_pad="13" + name="clipboard_size_btn" + tool_tip="Paste options" + width="19"/> <text type="string" length="1" follows="left|top" height="10" layout="topleft" - left_delta="0" + left_pad="8" + top_delta="0" name="label size" - top_pad="6" + tool_tip="Size (meters)" width="121"> - Size (meters) + Size (m) </text> <spinner follows="left|top" @@ -1505,12 +1544,12 @@ even though the user gets a free copy. label="X" label_width="10" layout="topleft" - left_delta="0" + left_delta="-27" max_val="64" min_val="0.01" name="Scale X" text_enabled_color="1 1 1 1" - top_pad="5" + top_pad="8" width="87" /> <spinner follows="left|top" @@ -1542,17 +1581,31 @@ even though the user gets a free copy. text_enabled_color="1 1 1 1" top_pad="3" width="87" /> + <menu_button + menu_filename="menu_copy_paste_rot.xml" + follows="top|left" + height="11" + image_disabled="ClipboardSmallMenu_Disabled" + image_selected="ClipboardSmallMenu_Press" + image_unselected="ClipboardSmallMenu_Off" + layout="topleft" + left_delta="0" + top_pad="13" + name="clipboard_rot_btn" + tool_tip="Paste options" + width="19"/> <text type="string" length="1" follows="left|top" height="10" layout="topleft" - left_delta="0" + left_pad="8" + top_delta="0" name="label rotation" - top_pad="10" + tool_tip="Rotation (degrees)" width="121"> - Rotation (degrees) + Rotation (°) </text> <spinner decimal_digits="2" @@ -1563,12 +1616,12 @@ even though the user gets a free copy. label="X" label_width="10" layout="topleft" - left_delta="0" + left_delta="-27" max_val="9999" min_val="-9999" name="Rot X" text_enabled_color="1 1 1 1" - top_pad="5" + top_pad="8" width="87" /> <spinner decimal_digits="2" @@ -1614,13 +1667,23 @@ even though the user gets a free copy. width="150"> Prim Type </text>--> + + <view_border + bevel_style="none" + follows="top|left" + layout="topleft" + name="object_vertical" + left="117" + top="6" + height="500" + width="0"/> <combo_box height="19" layout="topleft" name="comboBaseType" top="6" left="125" - width="150"> + width="125"> <combo_box.item label="Box" name="Box" @@ -1654,13 +1717,26 @@ even though the user gets a free copy. name="Sculpted" value="Sculpted" /> </combo_box> + <menu_button + menu_filename="menu_copy_paste_object.xml" + follows="top|left" + height="15" + image_disabled="ClipboardMenu_Disabled" + image_selected="ClipboardMenu_Press" + image_unselected="ClipboardMenu_Off" + layout="topleft" + left_pad="8" + top_delta="2" + name="clipboard_obj_params_btn" + tool_tip="Paste options" + width="22"/> <text type="string" length="1" follows="left|top" height="10" layout="topleft" - left_delta="0" + left="125" name="text cut" top_pad="5" width="150"> @@ -1700,7 +1776,7 @@ even though the user gets a free copy. layout="topleft" left="125" name="text hollow" - top_pad="6" + top_pad="7" width="68"> Hollow </text> @@ -1748,7 +1824,7 @@ even though the user gets a free copy. layout="topleft" left="125" name="Hollow Shape" - top_pad="4" + top_pad="7" width="150"> Hollow Shape </text> @@ -1784,7 +1860,7 @@ even though the user gets a free copy. layout="topleft" left_delta="0" name="text twist" - top_pad="5" + top_pad="7" width="150"> Twist (begin/end) </text> @@ -1826,12 +1902,12 @@ even though the user gets a free copy. layout="topleft" left="125" name="scale_taper" - top_pad="3" + top_pad="7" width="150"> Taper </text> <text - visible="false" + visible="false" type="string" length="1" follows="left|top" @@ -1879,7 +1955,7 @@ even though the user gets a free copy. layout="topleft" left="125" name="text topshear" - top_pad="3" + top_pad="5" width="141"> Top Shear </text> @@ -1922,12 +1998,12 @@ even though the user gets a free copy. layout="topleft" left="125" name="advanced_cut" - top_pad="3" + top_pad="7" width="150"> Profile Cut (begin/end) </text> <text - visible="false" + visible="false" type="string" length="1" follows="left|top" @@ -1986,7 +2062,7 @@ even though the user gets a free copy. layout="topleft" left="125" name="text taper2" - top_pad="3" + top_pad="7" width="150"> Taper </text> @@ -2029,7 +2105,7 @@ even though the user gets a free copy. layout="topleft" left="125" name="text radius delta" - top_pad="2" + top_pad="7" width="78"> Radius </text> @@ -2157,6 +2233,19 @@ even though the user gets a free copy. <panel.string name="None">None</panel.string> <panel.string name="Prim">Prim</panel.string> <panel.string name="Convex Hull">Convex Hull</panel.string> + <menu_button + menu_filename="menu_copy_paste_features.xml" + follows="top|left" + height="15" + image_disabled="ClipboardMenu_Disabled" + image_selected="ClipboardMenu_Press" + image_unselected="ClipboardMenu_Off" + layout="topleft" + left="258" + top="8" + name="clipboard_features_params_btn" + tool_tip="Paste options" + width="22"/> <text type="string" length="1" @@ -2309,6 +2398,15 @@ even though the user gets a free copy. name="FlexForceZ" top_pad="4" width="128" /> + <view_border + bevel_style="none" + follows="top|left" + height="0" + layout="topleft" + left="8" + name="object_horizontal" + top_pad="10" + width="278" /> <check_box height="16" @@ -2317,7 +2415,7 @@ even though the user gets a free copy. left="10" name="Light Checkbox Ctrl" tool_tip="Causes object to emit light" - top_pad="15" + top_pad="8" width="60" /> <color_swatch can_apply_immediately="true" @@ -2344,6 +2442,19 @@ even though the user gets a free copy. name="light texture control" tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)" width="32" /> + <menu_button + menu_filename="menu_copy_paste_light.xml" + follows="top|left" + height="15" + image_disabled="ClipboardMenu_Disabled" + image_selected="ClipboardMenu_Press" + image_unselected="ClipboardMenu_Off" + layout="topleft" + left="258" + top_delta="0" + name="clipboard_light_params_btn" + tool_tip="Paste options" + width="22"/> <spinner follows="left|top" height="19" @@ -2353,7 +2464,7 @@ even though the user gets a free copy. layout="topleft" left="10" name="Light Intensity" - top_pad="3" + top_pad="26" width="128" /> <spinner bottom_delta="0" decimal_digits="3" @@ -2575,7 +2686,7 @@ even though the user gets a free copy. border_visible="true" bevel_style="in" follows="left|top|right" - height="325" + height="335" layout="topleft" left="10" name="contents_inventory" diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 83407069d2..c965a4427c 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -14,6 +14,31 @@ single_instance="true" title="WORLD MAP" width="650"> + <string + name="collapse_icon" + value="map_ui_collapse_icon.png"/> + <string + name="expand_icon" + value="map_ui_expand_icon.png"/> + <string + name="collapse_tooltip" + value="Hide map controls"/> + <string + name="expand_tooltip" + value="Show map controls"/> + <layout_stack + animate="false" + follows="all" + name="floater_map_stack" + tab_group="1" + top="16" + left="0" + right="-1" + bottom="-1"> + <layout_panel + name="map_lp" + width="385" + height="575"> <panel filename="panel_world_map.xml" follows="all" @@ -21,17 +46,48 @@ layout="topleft" left="10" name="objects_mapview" - top="25" + top="6" width="375" /> + <panel + follows="top|right" + height="30" + layout="topleft" + left_pad="-29" + name="expand_btn_panel" + background_visible="true" + bg_opaque_color="FloaterFocusBackgroundColor" + bg_alpha_color="FloaterDefaultBackgroundColor" + background_opaque="true" + tool_tip="Hide map controls" + top="350" + width="30"> + <icon + follows="top|right" + height="16" + width="16" + top="7" + left="7" + scale_image="false" + image_name="map_ui_collapse_icon.png" + layout="topleft" + mouse_opaque="true" + name="expand_collapse_icon" + tool_tip="Hide map controls" /> + </panel> + </layout_panel> + <layout_panel + height="575" + width="265" + expanded_min_dim="265" + name="controls_lp"> <panel - name="layout_panel_1" - height="22" - width="238" - follows="right|top" - top="25" - left_pad="5" - background_visible="true" - bg_alpha_color="DkGray2"> + name="layout_panel_1" + height="22" + width="238" + follows="right|top" + top="6" + background_visible="true" + bg_alpha_color="DkGray2"> <text text_color="White" font="SansSerifLarge" @@ -43,17 +99,17 @@ layout="topleft" left="15" name="events_label" - top="3" width="215"> Legend </text> </panel> -<panel - follows="right|top" - height="126" - top_pad="0" - width="238" - name="layout_panel_2"> + <panel + follows="right|top" + height="126" + top_pad="4" + width="238" + left="1" + name="layout_panel_2"> <button follows="right|top" height="22" @@ -677,6 +733,7 @@ name="zoom_icon" top_pad="7" width="16" ></icon> + <!-- NOTE: min_val for zoom slider is hardcoded for performance reasons --> <slider follows="left|bottom" height="16" @@ -684,10 +741,12 @@ initial_value="-2" left_pad="0" layout="topleft" - max_val="0" + max_val="4" min_val="-8" name="zoom slider" show_text="false" width="200" /> </panel> + </layout_panel> + </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index ef4f19cd4c..fceb9b2184 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -85,6 +85,8 @@ use_ellipses="true" /> <text follows="left|top|right" + trusted_content="false" + always_show_icons="true" height="35" left="8" name="user_details" diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml index 26b1c86c53..3b91b9df7a 100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml @@ -33,6 +33,13 @@ function="Object.EnableTouch" name="EnableTouch"/> </menu_item_call> + <menu_item_call + label="Show in inventory" + layout="topleft" + name="Show original"> + <menu_item_call.on_click + function="Object.ShowOriginal" /> + </menu_item_call> <menu_item_separator layout="topleft" /> diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml index 05ab4d35a0..9f394a4c74 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml @@ -96,6 +96,13 @@ name="Pay"> <on_click function="AvatarIcon.Action" parameter="pay" /> </menu_item_call> + <menu_item_call + label="Report Abuse" + layout="topleft" + name="Report Abuse"> + <on_click function="AvatarIcon.Action" parameter="report_abuse" /> + <on_enable function="AvatarIcon.Enable" parameter="report_abuse" /> + </menu_item_call> <menu_item_check label="Block Voice" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml index 500b6fffc2..20f3ad080b 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml @@ -290,4 +290,11 @@ <menu_item_call.on_visible function="EnableMuteParticle" /> </menu_item_call> + <menu_item_separator/> + <menu_item_call label="View Profile" + layout="topleft" + name="show_avatar_profile"> + <menu_item_call.on_click + function="Avatar.ToggleMyProfile" /> + </menu_item_call> </context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml index ed362b36e5..59e6106a28 100644 --- a/indra/newview/skins/default/xui/en/menu_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation.xml @@ -132,6 +132,13 @@ <on_click function="Avatar.DoToSelected" parameter="pay" /> <on_enable function="Avatar.EnableItem" parameter="can_pay" /> </menu_item_call> + <menu_item_call + label="Report Abuse" + layout="topleft" + name="report_abuse"> + <on_click function="Avatar.DoToSelected" parameter="report_abuse" /> + <on_enable function="Avatar.EnableItem" parameter="report_abuse" /> + </menu_item_call> <menu_item_check label="Block Voice" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_color.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_color.xml new file mode 100644 index 0000000000..4c12180daf --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_color.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="Copy Paste Color Menu"> + <menu_item_call + label="Copy" + layout="topleft" + name="params_copy" + visible="true"> + <on_click function="PanelFace.menuDoToSelected" parameter="color_copy" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="params_paste" + visible="true"> + <on_click function="PanelFace.menuDoToSelected" parameter="color_paste" /> + <on_enable function="PanelFace.menuEnable" parameter="color_paste" /> + </menu_item_call> +</toggleable_menu> + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_features.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_features.xml new file mode 100644 index 0000000000..4823d74a26 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_features.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="Copy Paste Features Menu"> + <menu_item_call + label="Copy" + layout="topleft" + name="params_copy" + visible="true"> + <on_click function="PanelVolume.menuDoToSelected" parameter="features_copy" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="params_paste" + visible="true"> + <on_click function="PanelVolume.menuDoToSelected" parameter="features_paste" /> + <on_enable function="PanelVolume.menuEnable" parameter="features_paste" /> + </menu_item_call> +</toggleable_menu> + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_light.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_light.xml new file mode 100644 index 0000000000..5de23dfee3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_light.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="Copy Paste Light Menu"> + <menu_item_call + label="Copy" + layout="topleft" + name="params_copy" + visible="true"> + <on_click function="PanelVolume.menuDoToSelected" parameter="light_copy" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="params_paste" + visible="true"> + <on_click function="PanelVolume.menuDoToSelected" parameter="light_paste" /> + <on_enable function="PanelVolume.menuEnable" parameter="light_paste" /> + </menu_item_call> +</toggleable_menu> + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_object.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_object.xml new file mode 100644 index 0000000000..bdc4537a9d --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_object.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="Copy Paste Object Menu"> + <menu_item_call + label="Copy" + layout="topleft" + name="params_copy" + visible="true"> + <on_click function="PanelObject.menuDoToSelected" parameter="params_copy" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="params_paste" + visible="true"> + <on_click function="PanelObject.menuDoToSelected" parameter="params_paste" /> + <on_enable function="PanelObject.menuEnable" parameter="params_paste" /> + </menu_item_call> +</toggleable_menu> + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_pos.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_pos.xml new file mode 100644 index 0000000000..3ea95b281f --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_pos.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="Copy Paste Position Menu"> + <menu_item_call + label="Copy all" + layout="topleft" + name="psr_copy" + visible="true"> + <on_click function="PanelObject.menuDoToSelected" parameter="psr_copy" /> + <on_enable function="PanelObject.menuEnable" parameter="psr_copy" /> + </menu_item_call> + <menu_item_call + label="Copy position" + layout="topleft" + name="pos_copy" + visible="true"> + <on_click function="PanelObject.menuDoToSelected" parameter="pos_copy" /> + </menu_item_call> + <menu_item_call + label="Paste all" + layout="topleft" + name="psr_paste" + visible="true"> + <on_click function="PanelObject.menuDoToSelected" parameter="psr_paste" /> + <on_enable function="PanelObject.menuEnable" parameter="psr_paste" /> + </menu_item_call> + <menu_item_call + label="Paste position" + layout="topleft" + name="pos_paste" + visible="true"> + <on_click function="PanelObject.menuDoToSelected" parameter="pos_paste" /> + <on_enable function="PanelObject.menuEnable" parameter="pos_paste" /> + </menu_item_call> +</toggleable_menu> + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml new file mode 100644 index 0000000000..06ce80f897 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="Copy Paste Rotation Menu"> + <menu_item_call + label="Copy all" + layout="topleft" + name="psr_copy" + visible="true"> + <on_click function="PanelObject.menuDoToSelected" parameter="psr_copy" /> + <on_enable function="PanelObject.menuEnable" parameter="rot_paste" /> + </menu_item_call> + <menu_item_call + label="Copy rotation" + layout="topleft" + name="rot_copy" + visible="true"> + <on_click function="PanelObject.menuDoToSelected" parameter="rot_copy" /> + </menu_item_call> + <menu_item_call + label="Paste all" + layout="topleft" + name="psr_paste" + visible="true"> + <on_click function="PanelObject.menuDoToSelected" parameter="psr_paste" /> + <on_enable function="PanelObject.menuEnable" parameter="psr_paste" /> + </menu_item_call> + <menu_item_call + label="Paste rotation" + layout="topleft" + name="rot_paste" + visible="true"> + <on_click function="PanelObject.menuDoToSelected" parameter="rot_paste" /> + <on_enable function="PanelObject.menuEnable" parameter="rot_paste" /> + </menu_item_call> +</toggleable_menu> + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_size.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_size.xml new file mode 100644 index 0000000000..7082a0e65b --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_size.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="Copy Paste Size Menu"> + <menu_item_call + label="Copy all" + layout="topleft" + name="psr_copy" + visible="true"> + <on_click function="PanelObject.menuDoToSelected" parameter="psr_copy" /> + <on_enable function="PanelObject.menuEnable" parameter="psr_copy" /> + </menu_item_call> + <menu_item_call + label="Copy size" + layout="topleft" + name="size_copy" + visible="true"> + <on_click function="PanelObject.menuDoToSelected" parameter="size_copy" /> + </menu_item_call> + <menu_item_call + label="Paste all" + layout="topleft" + name="psr_paste" + visible="true"> + <on_click function="PanelObject.menuDoToSelected" parameter="psr_paste" /> + <on_enable function="PanelObject.menuEnable" parameter="psr_paste" /> + </menu_item_call> + <menu_item_call + label="Paste size" + layout="topleft" + name="size_paste" + visible="true"> + <on_click function="PanelObject.menuDoToSelected" parameter="size_paste" /> + <on_enable function="PanelObject.menuEnable" parameter="size_paste" /> + </menu_item_call> +</toggleable_menu> + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_texture.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_texture.xml new file mode 100644 index 0000000000..f358affc23 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_texture.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="Copy Paste Texture Menu"> + <menu_item_call + label="Copy" + layout="topleft" + name="params_copy" + visible="true"> + <on_click function="PanelFace.menuDoToSelected" parameter="texture_copy" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="params_paste" + visible="true"> + <on_click function="PanelFace.menuDoToSelected" parameter="texture_paste" /> + <on_enable function="PanelFace.menuEnable" parameter="texture_paste" /> + </menu_item_call> +</toggleable_menu> + diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml index 5cae643e44..359c093eff 100644 --- a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml @@ -9,7 +9,7 @@ layout="topleft" name="activate"> <on_click - function="Gesture.Action.ToogleActiveState" /> + function="Gesture.Action.ToggleActiveState" /> </menu_item_call> <menu_item_call label="Rename" diff --git a/indra/newview/skins/default/xui/en/menu_im_conversation.xml b/indra/newview/skins/default/xui/en/menu_im_conversation.xml index 43287c6ec3..b38fae4404 100644 --- a/indra/newview/skins/default/xui/en/menu_im_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_im_conversation.xml @@ -79,6 +79,13 @@ </menu_item_call> <menu_item_separator layout="topleft"/> + <menu_item_call + label="Report Abuse" + layout="topleft" + name="Report Abuse"> + <on_click function="Avatar.GearDoToSelected" parameter="report_abuse" /> + <on_enable function="Avatar.EnableGearItem" parameter="report_abuse" /> + </menu_item_call> <menu_item_check label="Block Voice" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 78ca170813..aa3d0ae071 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -912,6 +912,25 @@ function="Inventory.DoToSelected" parameter="apply_settings_parcel" /> </menu_item_call> + <menu_item_separator + layout="topleft" + name="Subfolder Separator" /> + <menu_item_call + label="Create folder from selected" + layout="topleft" + name="New folder from selected"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="new_folder_from_selected" /> + </menu_item_call> + <menu_item_call + label="Ungroup folder items" + layout="topleft" + name="Ungroup folder items"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="ungroup_folder_items" /> + </menu_item_call> <menu_item_separator layout="topleft" name="Marketplace Separator" /> diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml index ea263d05ce..2715c916d4 100644 --- a/indra/newview/skins/default/xui/en/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml @@ -8,63 +8,109 @@ top="724" visible="false" width="128"> - <menu_item_call - label="Zoom Close" - name="Zoom Close"> - <menu_item_call.on_click - function="Minimap.Zoom" + <menu_item_check + label="Zoom very close" + name="Zoom very close"> + <menu_item_check.on_check + function="Minimap.Zoom.Check" + parameter="very close" /> + <menu_item_check.on_click + function="Minimap.Zoom.Set" + parameter="very close" /> + </menu_item_check> + <menu_item_check + label="Zoom close" + name="Zoom close"> + <menu_item_check.on_check + function="Minimap.Zoom.Check" parameter="close" /> - </menu_item_call> - <menu_item_call - label="Zoom Medium" - name="Zoom Medium"> - <menu_item_call.on_click - function="Minimap.Zoom" + <menu_item_check.on_click + function="Minimap.Zoom.Set" + parameter="close" /> + </menu_item_check> + <menu_item_check + label="Zoom medium" + name="Zoom medium"> + <menu_item_check.on_check + function="Minimap.Zoom.Check" parameter="medium" /> - </menu_item_call> - <menu_item_call - label="Zoom Far" - name="Zoom Far"> - <menu_item_call.on_click - function="Minimap.Zoom" + <menu_item_check.on_click + function="Minimap.Zoom.Set" + parameter="medium" /> + </menu_item_check> + <menu_item_check + label="Zoom far" + name="Zoom far"> + <menu_item_check.on_check + function="Minimap.Zoom.Check" parameter="far" /> - </menu_item_call> - <menu_item_call - label="Zoom Default" - name="Zoom Default"> - <menu_item_call.on_click - function="Minimap.Zoom" - parameter="default" /> - </menu_item_call> + <menu_item_check.on_click + function="Minimap.Zoom.Set" + parameter="far" /> + </menu_item_check> <menu_item_separator /> <menu_item_check - label="Rotate Map" - name="Rotate Map"> + label="North at top" + name="North at top"> <menu_item_check.on_check - control="MiniMapRotate" /> + function="Minimap.MapOrientation.Check" + parameter="north_at_top" /> <menu_item_check.on_click - function="ToggleControl" - parameter="MiniMapRotate" /> + function="Minimap.MapOrientation.Set" + parameter="north_at_top" /> </menu_item_check> <menu_item_check - label="Auto Center" - name="Auto Center"> + label="Camera at top" + name="Camera at top"> <menu_item_check.on_check - control="MiniMapAutoCenter" /> + function="Minimap.MapOrientation.Check" + parameter="camera_at_top" /> <menu_item_check.on_click - function="ToggleControl" - parameter="MiniMapAutoCenter" /> + function="Minimap.MapOrientation.Set" + parameter="camera_at_top" /> + </menu_item_check> + <menu_item_separator /> + <menu_item_check + label="Show parcel boundaries" + name="Show parcel boundaries"> + <menu_item_check.on_check + control="MiniMapShowPropertyLines" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="MiniMapShowPropertyLines" /> </menu_item_check> <menu_item_separator /> + <menu_item_check + label="Auto-center map" + name="Auto-center map"> + <menu_item_check.on_check + control="MiniMapAutoCenter" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="MiniMapAutoCenter" /> + </menu_item_check> + <menu_item_separator /> + <menu_item_call + label="Re-center map" + name="Re-center map"> + <menu_item_call.on_click + function="Minimap.Center.Activate" /> + </menu_item_call> <menu_item_call - label="Stop Tracking" - name="Stop Tracking"> + label="Stop tracking" + name="Stop tracking"> <menu_item_call.on_click function="Minimap.Tracker" parameter="task_properties" /> </menu_item_call> <menu_item_separator /> <menu_item_call + label="About Land" + name="About Land"> + <menu_item_call.on_click + function="Minimap.AboutLand" /> + </menu_item_call> + <menu_item_call label="World Map" name="World Map"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_profile_other.xml b/indra/newview/skins/default/xui/en/menu_profile_other.xml new file mode 100644 index 0000000000..4db4d0922b --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_profile_other.xml @@ -0,0 +1,171 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="Avatar Profile Menu"> + <menu_item_call + label="IM" + layout="topleft" + name="im"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="im"/> + </menu_item_call> + <menu_item_call + label="Offer Teleport" + name="offer_teleport"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="offer_teleport"/> + <menu_item_call.on_enable + function="Profile.EnableItem" + parameter="offer_teleport"/> + </menu_item_call> + <menu_item_call + label="Request Teleport" + name="request_teleport"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="request_teleport"/> + <menu_item_call.on_enable + function="Profile.EnableItem" + parameter="request_teleport"/> + </menu_item_call> + <menu_item_call + label="Voice call" + layout="topleft" + name="voice_call"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="voice_call"/> + <menu_item_call.on_enable + function="Profile.EnableItem" + parameter="voice_call"/> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + label="View chat history..." + layout="topleft" + name="chat_history"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="chat_history"/> + <menu_item_call.on_enable + function="Profile.EnableItem" + parameter="chat_history"/> + </menu_item_call> + <menu_item_separator name="separator_chat_history"/> + <menu_item_call + label="Add Friend" + layout="topleft" + name="add_friend"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="add_friend"/> + <menu_item_call.on_visible + function="Profile.EnableItem" + parameter="add_friend"/> + </menu_item_call> + <menu_item_call + label="Remove Friend" + layout="topleft" + name="remove_friend"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="remove_friend"/> + <menu_item_call.on_enable + function="Profile.EnableItem" + parameter="remove_friend"/> + </menu_item_call> + <menu_item_call + label="Invite to group..." + layout="topleft" + name="invite_to_group"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="invite_to_group"/> + </menu_item_call> + <menu_item_separator name="separator_invite_to_group"/> + <menu_item_call + label="Permissions" + layout="topleft" + name="agent_permissions"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="agent_permissions"/> + <menu_item_call.on_visible + function="Profile.EnableItem" + parameter="agent_permissions"/> + </menu_item_call> + <menu_item_call + label="Map" + layout="topleft" + name="map"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="can_show_on_map"/> + <menu_item_call.on_enable + function="Profile.EnableItem" + parameter="can_show_on_map"/> + </menu_item_call> + <menu_item_call + label="Share" + layout="topleft" + name="share"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="share"/> + </menu_item_call> + <menu_item_call + label="Pay" + layout="topleft" + name="pay"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="pay"/> + </menu_item_call> + <menu_item_check + label="Block/Unblock" + layout="topleft" + name="block_unblock"> + <menu_item_check.on_click + function="Profile.Commit" + parameter="toggle_block_agent"/> + <menu_item_check.on_check + function="Profile.CheckItem" + parameter="toggle_block_agent"/> + <menu_item_check.on_enable + function="Profile.EnableItem" + parameter="toggle_block_agent"/> + </menu_item_check> + <menu_item_separator name="separator_copy_options"/> + <menu_item_call + label="Copy Display Name" + layout="topleft" + name="copy_display_name"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="copy_display_name"/> + <menu_item_call.on_enable + function="Profile.EnableItem" + parameter="copy_display_name"/> + </menu_item_call> + <menu_item_call + label="Copy Agent Name" + layout="topleft" + name="copy_name"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="copy_username"/> + <menu_item_call.on_enable + function="Profile.EnableItem" + parameter="copy_username"/> + </menu_item_call> + <menu_item_call + label="Copy Agent Id" + layout="topleft" + name="copy_id"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="copy_user_id"/> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_profile_self.xml b/indra/newview/skins/default/xui/en/menu_profile_self.xml new file mode 100644 index 0000000000..d0bd4000f8 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_profile_self.xml @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="Avatar Profile Menu Self"> + <menu_item_call + label="Edit Display Name" + layout="topleft" + name="edit_display_name"> + <on_click + function="Profile.Commit" + parameter="edit_display_name"/> + </menu_item_call> + <menu_item_call + label="Edit Partner" + layout="topleft" + name="edit_partner"> + <on_click + function="Profile.Commit" + parameter="edit_partner"/> + </menu_item_call> + <menu_item_call + label="Upload Photo" + layout="topleft" + name="upload_photo"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="upload_photo"/> + <menu_item_call.on_enable + function="Profile.EnableItem" + parameter="upload_photo"/> + </menu_item_call> + <menu_item_call + label="Change Photo" + layout="topleft" + name="change_photo"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="change_photo"/> + <menu_item_call.on_enable + function="Profile.EnableItem" + parameter="change_photo"/> + </menu_item_call> + <menu_item_call + label="Remove Photo" + layout="topleft" + name="remove_photo"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="remove_photo"/> + <menu_item_call.on_enable + function="Profile.EnableItem" + parameter="remove_photo"/> + </menu_item_call> + <menu_item_separator name="separator_copy_options"/> + <menu_item_call + label="Copy Display Name" + layout="topleft" + name="copy_display_name"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="copy_display_name"/> + <menu_item_call.on_enable + function="Profile.EnableItem" + parameter="copy_display_name"/> + </menu_item_call> + <menu_item_call + label="Copy Agent Name" + layout="topleft" + name="copy_name"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="copy_username"/> + <menu_item_call.on_enable + function="Profile.EnableItem" + parameter="copy_username"/> + </menu_item_call> + <menu_item_call + label="Copy Agent Id" + layout="topleft" + name="copy_id"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="copy_user_id"/> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml index e8b6116026..5ca8be2123 100644 --- a/indra/newview/skins/default/xui/en/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml @@ -29,7 +29,14 @@ name="remove_friend"> <menu_item_call.on_click function="Url.RemoveFriend" /> - </menu_item_call> + </menu_item_call> + <menu_item_call + label="Report Abuse" + layout="topleft" + name="report_abuse"> + <menu_item_call.on_click + function="Url.ReportAbuse" /> + </menu_item_call> <menu_item_separator layout="topleft" /> <menu_item_call diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 1caa0908ea..58584345a9 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -47,8 +47,7 @@ label="Picks..." name="Picks"> <menu_item_call.on_click - function="Floater.ToggleOrBringToFront" - parameter="picks" /> + function="ShowAgentProfilePicks" /> </menu_item_call> <menu_item_call label="Experiences..." @@ -423,7 +422,9 @@ </menu_item_call> <menu_item_call label="Stop animations" - name="Stop Animating My Avatar"> + name="Stop Animating My Avatar" + allow_key_repeat="true" + shortcut="alt|shift|A"> <menu_item_call.on_click function="Tools.StopAllAnimations" /> </menu_item_call> @@ -2647,6 +2648,12 @@ function="World.EnvPreset" function="Advanced.ForceErrorBadMemoryAccess" /> </menu_item_call> <menu_item_call + label="Force Bad Memory Access in Coroutine" + name="Force Bad Memory Access in Coroutine"> + <menu_item_call.on_click + function="Advanced.ForceErrorBadMemoryAccessCoro" /> + </menu_item_call> + <menu_item_call label="Force Infinite Loop" name="Force Infinite Loop"> <menu_item_call.on_click @@ -3326,6 +3333,18 @@ function="World.EnvPreset" function="Advanced.DropPacket" /> </menu_item_call> </menu> + <menu + create_jump_keys="true" + label="Cache" + name="Cache" + tear_off="true"> + <menu_item_call + label="Purge Disk Cache" + name="Purge Disk Cache"> + <menu_item_call.on_click + function="Advanced.PurgeDiskCache" /> + </menu_item_call> + </menu> <menu_item_call label="Dump Scripted Camera" name="Dump Scripted Camera"> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index aa93601669..1ddec93668 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1496,7 +1496,19 @@ Insufficient funds to create classified. <notification icon="alertmodal.tga" - name="DeleteAvatarPick" + name="ProfileDeleteClassified" + type="alertmodal"> +Delete classified <nolink>[CLASSIFIED]</nolink>? + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="ProfileDeletePick" type="alertmodal"> Delete pick <nolink>[PICK]</nolink>? <tag>confirm</tag> @@ -1507,6 +1519,32 @@ Delete pick <nolink>[PICK]</nolink>? </notification> <notification + icon="alert.tga" + name="ProfileUnpublishedClassified" + type="alertmodal"> + You have unpublished classifieds. They will be lost if you close the window. + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alert.tga" + name="ProfileUnsavedChanges" + type="alertmodal"> + You have usaved changes. + <tag>confirm</tag> + <tag>save</tag> + <usetemplate + canceltext="Cancel" + name="yesnocancelbuttons" + notext="Discard" + yestext="Save"/> + </notification> + + <notification icon="alertmodal.tga" name="DeleteOutfits" type="alertmodal"> @@ -3907,7 +3945,7 @@ Are you sure you want to return objects owned by [USER_NAME]? Couldn't set region textures: Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH]. -Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click "Apply" again. +Replace texture [TEXTURE_NUM] with a 24-bit [MAX_SIZE]x[MAX_SIZE] or smaller image then click "Apply" again. <tag>fail</tag> </notification> @@ -3918,7 +3956,7 @@ Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click Couldn't set region textures: Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. -Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click "Apply" again. +Replace texture [TEXTURE_NUM] with a 24-bit [MAX_SIZE]x[MAX_SIZE] or smaller image then click "Apply" again. </notification> <notification @@ -9040,6 +9078,29 @@ We cannot display a preview of this texture because it is no-copy and/or no-tran <notification icon="alertmodal.tga" + name="FacePasteFailed" + type="alertmodal"> +Paste failed. [REASON] + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="FacePasteTexturePermissions" + type="alertmodal"> + You applied a texture with limited permissions, object will inherit permissions from texture. + <usetemplate + ignoretext="Paste: You applied a texture with limited permissions" + name="notifyignore"/> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="ConfirmLeaveCall" type="alertmodal"> Are you sure you want to leave this call? @@ -11640,7 +11701,7 @@ This Region does not support environmental settings. <notification icon="alertmodal.tga" - label="Save Outfit" + label="Save Environmental Settings" name="SaveSettingAs" type="alertmodal"> <unique/> @@ -11819,4 +11880,38 @@ Unpacking: [UNPACK_TIME]s [USIZE]KB </form> </notification> + <notification + icon="alertmodal.tga" + label="Create subfolder" + name="CreateSubfolder" + type="alertmodal"> + <unique/> + Name the new folder: + <tag>confirm</tag> + <form name="form"> + <input name="message" type="text"> + [DESC] + </input> + <button + default="true" + index="0" + name="OK" + text="OK"/> + <button + index="1" + name="Cancel" + text="Cancel"/> + </form> + </notification> + <notification + icon="alertmodal.tga" + name="SameFolderRequired" + type="alert"> + Selected items must be in the same folder. + <tag>fail</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + </notifications> diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index aa1b929412..54f038c24f 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -155,6 +155,7 @@ right="-3" mouse_opaque="true" name="speaking_indicator" + tool_tip="Voice volume" visible="true" width="20" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index d4a2745d1d..04a0bc800d 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -38,28 +38,15 @@ name="auto_renew_off"> Disabled </panel.string> - <button - follows="top|left" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" - layout="topleft" - name="back_btn" - left="10" - tab_stop="false" - top="2" - width="30" - use_draw_context_alpha="false" /> <text follows="top|left|right" font="SansSerifHugeBold" height="26" layout="topleft" - left_pad="4" + left="12" name="title" text_color="LtGray" - top="0" + top="2" value="Classified Info" use_ellipses="true" width="275" /> @@ -420,7 +407,7 @@ height="23" label="Teleport" layout="topleft" - left="0" + left="2" name="teleport_btn" top="0" width="101" /> @@ -443,24 +430,6 @@ top="0" width="100" /> </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - name="edit_btn_lp" - auto_resize="true" - width="101"> - <button - follows="bottom|left|right" - height="23" - label="Edit" - layout="topleft" - name="edit_btn" - top="0" - width="101" /> - </layout_panel> </layout_stack> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml deleted file mode 100644 index e846edf1d4..0000000000 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ /dev/null @@ -1,354 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - background_visible="true" - bevel_style="in" - follows="left|top|right|bottom" - height="569" - label="Edit Classified" - layout="topleft" - left="0" - min_height="350" - name="panel_edit_classified" - help_topic="profile_edit_classified" - top="0" - width="333"> - <panel.string - name="location_notice"> - (will update after save) - </panel.string> - <string name="publish_label"> - Publish - </string> - <string name="save_label"> - Save - </string> - <button - follows="top|left" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" - layout="topleft" - name="back_btn" - left="10" - tab_stop="false" - top="2" - width="30" - use_draw_context_alpha="false" /> - <text - type="string" - length="1" - follows="top" - font="SansSerifHugeBold" - height="26" - layout="topleft" - left_pad="4" - name="title" - text_color="LtGray" - top="0" - width="250"> - Edit Classified - </text> - <scroll_container - color="DkGray2" - follows="all" - height="502" - layout="topleft" - left="8" - top_pad="10" - name="profile_scroll" - reserve_scroll_corner="false" - opaque="true" - width="312"> - <panel - name="scroll_content_panel" - follows="left|top" - min_height="300" - layout="topleft" - top="0" - background_visible="false" - height="690" - left="0" - width="285"> - <panel - name="snapshot_panel" - layout="topleft" - follows="left|top|right" - height="197" - left="10" - top="10" - width="272"> - <texture_picker - fallback_image="default_land_picture.j2c" - follows="left|top|right" - height="197" - width="272" - layout="topleft" - top="0" - left="0" - name="classified_snapshot" /> - <icon - height="197" - image_name="spacer24.tga" - layout="topleft" - name="edit_icon" - label="" - tool_tip="Click to select an image" - top="0" - left="0" - width="272" /> - </panel> - <text - type="string" - length="1" - follows="left|top" - height="15" - font="SansSerifSmall" - font.style="BOLD" - layout="topleft" - left="10" - top="215" - name="Name:" - text_color="white" - width="280"> - Title: - </text> - <line_editor - follows="left|top|right" - font="SansSerif" - height="20" - layout="topleft" - left="10" - top_pad="2" - max_length_bytes="30" - name="classified_name" - prevalidate_callback="ascii" - text_color="black" - width="273" /> - <text - type="string" - length="1" - follows="left|top" - height="15" - font="SansSerifSmall" - font.style="BOLD" - layout="topleft" - left="10" - top_pad="20" - name="description_label" - text_color="white" - width="280"> - Description: - </text> - <text_editor - follows="left|top|right" - height="100" - width="273" - layout="topleft" - left="10" - top_pad="2" - max_length="256" - name="classified_desc" - text_color="black" - word_wrap="true" /> - <text - type="string" - length="1" - font="SansSerifSmall" - font.style="BOLD" - follows="left|top" - height="15" - layout="topleft" - left="10" - name="location_label" - text_color="white" - top_pad="20" - width="280"> - Location: - </text> - <text - type="string" - length="1" - follows="left|top" - height="30" - layout="topleft" - left="10" - name="classified_location" - right="-10" - top_pad="2" - width="280" - word_wrap="true"> - loading... - </text> - <button - follows="left|top" - height="23" - label="Set to Current Location" - layout="topleft" - left="10" - top_pad="5" - name="set_to_curr_location_btn" - width="200" /> - <text - follows="left|top" - font.style="BOLD" - height="10" - layout="topleft" - left="10" - name="category_label" - text_color="white" - top_pad="15" - value="Category:" - width="250" /> - <combo_box - follows="left|top" - height="23" - label="" - left="10" - name="category" - top_pad="5" - width="156" /> - <text - follows="left|top" - font.style="BOLD" - height="10" - layout="topleft" - left="10" - name="content_type_label" - text_color="white" - top_pad="15" - value="Content type:" - width="250" /> - <icons_combo_box - follows="left|top" - height="23" - label="General Content" - layout="topleft" - left="10" - name="content_type" - top_pad="5" - width="156"> - <icons_combo_box.drop_down_button - image_overlay="Parcel_PG_Light" - image_overlay_alignment="left" - imgoverlay_label_space="3" - pad_left="3"/> - <icons_combo_box.item - label="Moderate Content" - name="mature_ci" - value="Mature"> - <item.columns - halign="center" - type="icon" - value="Parcel_M_Light" - width="20"/> - </icons_combo_box.item> - <icons_combo_box.item - label="General Content" - name="pg_ci" - value="PG"> - <item.columns - halign="center" - type="icon" - value="Parcel_PG_Light" - width="20"/> - </icons_combo_box.item> - </icons_combo_box> - <check_box - height="16" - label="Auto renew each week" - layout="topleft" - left="10" - name="auto_renew" - top_pad="15" - width="250" /> - <text - follows="left|top" - height="10" - layout="topleft" - left="10" - name="price_for_listing_label" - text_color="white" - top_pad="15" - value="Price for listing:" - width="250" /> - <spinner - decimal_digits="0" - follows="left|top" - halign="left" - height="23" - increment="1" - label_width="20" - label="L$" - v_pad="10" - layout="topleft" - left="10" - value="50" - min_val="50" - max_val="99999" - name="price_for_listing" - top_pad="5" - tool_tip="Price for listing." - width="105" /> - </panel> - </scroll_container> - <panel - follows="left|right|bottom" - height="23" - label="bottom_panel" - layout="topleft" - left="8" - name="bottom_panel" - top_pad="5" - width="303"> - - <layout_stack - follows="bottom|left|right" - height="23" - layout="topleft" - name="bottom_panel_ls" - left="1" - orientation="horizontal" - top_pad="0" - width="309"> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left="0" - name="save_changes_btn_lp" - auto_resize="true" - width="156"> - <button - follows="bottom|left|right" - height="23" - label="[LABEL]" - layout="topleft" - name="save_changes_btn" - left="1" - top="0" - width="155" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - name="show_on_map_btn_lp" - auto_resize="true" - width="157"> - <button - follows="bottom|left|right" - height="23" - label="Cancel" - layout="topleft" - name="cancel_btn" - left="1" - top="0" - width="156" /> - </layout_panel> - </layout_stack> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml deleted file mode 100644 index 357a5559bf..0000000000 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ /dev/null @@ -1,239 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - background_visible="true" - bevel_style="in" - follows="left|top|right|bottom" - height="569" - label="Edit Pick" - layout="topleft" - left="0" - min_height="350" - name="panel_edit_pick" - help_topic="profile_edit_pick" - top="0" - width="333"> - <panel.string - name="location_notice"> - (will update after save) - </panel.string> - <button - follows="top|left" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" - layout="topleft" - name="back_btn" - left="10" - tab_stop="false" - top="4" - width="30" - use_draw_context_alpha="false" /> - <text - type="string" - length="1" - follows="top" - font="SansSerifHugeBold" - height="26" - layout="topleft" - left_pad="4" - name="title" - text_color="LtGray" - top="4" - width="250"> - Edit Pick - </text> - <scroll_container - color="DkGray2" - follows="all" - height="501" - layout="topleft" - left="8" - top_pad="9" - name="profile_scroll" - opaque="true" - width="312"> - <panel - name="scroll_content_panel" - follows="left|top|right" - min_height="300" - layout="topleft" - top="0" - background_visible="false" - height="500" - left="0" - width="285"> - <texture_picker - fallback_image="default_land_picture.j2c" - follows="left|top|right" - height="197" - width="272" - layout="topleft" - no_commit_on_selection="true" - top="10" - left="11" - name="pick_snapshot" /> - <icon - height="197" - image_name="spacer24.tga" - layout="topleft" - name="edit_icon" - label="" - tool_tip="Click to select an image" - top="10" - left="11" - width="286" /> - <text - type="string" - length="1" - follows="left|top|right" - height="15" - font="SansSerifSmall" - font.style="BOLD" - layout="topleft" - left="10" - top="215" - name="Name:" - text_color="white" - width="280"> - Title: - </text> - <line_editor - follows="left|top|right" - font="SansSerif" - height="20" - layout="topleft" - left="10" - top_pad="2" - max_length_bytes="63" - name="pick_name" - text_color="black" - width="273" /> - <text - type="string" - length="1" - follows="left|top|right" - height="15" - font="SansSerifSmall" - font.style="BOLD" - layout="topleft" - left="10" - top_pad="20" - name="description_label" - text_color="white" - width="280"> - Description: - </text> - <text_editor - follows="left|top|right" - height="100" - width="273" - hide_scrollbar="false" - layout="topleft" - left="10" - top_pad="2" - max_length="1023" - name="pick_desc" - spellcheck="true" - text_color="black" - word_wrap="true" /> - <text - type="string" - length="1" - font="SansSerifSmall" - font.style="BOLD" - follows="left|top|right" - height="15" - layout="topleft" - left="10" - name="location_label" - text_color="white" - top_pad="20" - width="280"> - Location: - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="50" - layout="topleft" - left="10" - name="pick_location" - top_pad="2" - width="280" - word_wrap="true"> - loading... - </text> - <button - follows="left|top" - height="23" - label="Set to Current Location" - layout="topleft" - left="8" - top_pad="0" - name="set_to_curr_location_btn" - width="200" /> - </panel> - </scroll_container> - <panel - follows="left|right|bottom" - height="23" - label="bottom_panel" - layout="topleft" - left="8" - name="bottom_panel" - top_pad="5" - width="315"> - - <layout_stack - follows="bottom|left|right" - height="23" - layout="topleft" - name="layout_stack1" - left="0" - orientation="horizontal" - top_pad="0" - width="313"> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="topleft" - left="0" - name="layout_panel1" - auto_resize="true" - width="150"> - <button - follows="bottom|left|right" - height="23" - label="Save Pick" - layout="topleft" - name="save_changes_btn" - top="0" - left="1" - width="149" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="topleft" - left_pad="4" - name="layout_panel2" - auto_resize="true" - width="146"> - <button - follows="bottom|left|right" - height="23" - label="Cancel" - layout="topleft" - name="cancel_btn" - top="0" - left="1" - width="145" /> - </layout_panel> - </layout_stack> - - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml deleted file mode 100644 index 2c7c8133d1..0000000000 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ /dev/null @@ -1,472 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - background_visible="true" - class="edit_profile_panel" - follows="all" - height="585" - label="Profile Edit" - layout="topleft" - left="0" - name="edit_profile_panel" - top="0" - width="313"> - <string - name="CaptionTextAcctInfo"> - [ACCTTYPE] -[PAYMENTINFO] [AGEVERIFICATION] - </string> - <string - name="RegisterDateFormat"> - [REG_DATE] ([AGE]) - </string> - <string - name="AcctTypeResident" - value="Resident" /> - <string - name="AcctTypeTrial" - value="Trial" /> - <string - name="AcctTypeCharterMember" - value="Charter Member" /> - <string - name="AcctTypeEmployee" - value="Linden Lab Employee" /> - <string - name="PaymentInfoUsed" - value="Payment Info Used" /> - <string - name="PaymentInfoOnFile" - value="Payment Info On File" /> - <string - name="NoPaymentInfoOnFile" - value="No Payment Info On File" /> - <string - name="AgeVerified" - value="Age-verified" /> - <string - name="NotAgeVerified" - value="Not Age-verified" /> - <string - name="partner_edit_link_url"> - http://www.secondlife.com/account/partners.php?lang=en - </string> - <string - name="my_account_link_url"> - http://secondlife.com/my - </string> - <string - name="no_partner_text" - value="None" /> - <scroll_container - color="DkGray2" - follows="all" - height="537" - min_height="300" - layout="topleft" - left="8" - width="292" - name="profile_scroll" - reserve_scroll_corner="true" - opaque="true" - top="10"> - <panel - name="scroll_content_panel" - follows="left|top|right" - layout="topleft" - top="0" - height="537" - min_height="300" - left="0" - width="292"> - <panel - name="data_panel" - follows="left|top|right" - layout="topleft" - top="0" - height="537" - min_height="300" - left="0" - width="292"> - <text - top="5" - follows="top|left" - height="13" - layout="topleft" - left="10" - name="display_name_label" - text_color="LtGray" - value="Display Name:" - width="80" /> - <text - top="5" - follows="top|left" - height="13" - layout="topleft" - left="10" - name="solo_username_label" - text_color="LtGray" - value="Username:" - visible="false" - width="80" /> - <button - name="set_name" - layout="topleft" - follows="top|left" - image_overlay="Edit_Wrench" - top="21" - left="10" - height="23" - width="23" - tool_tip="Set Display Name"/> - <text - follows="top|left" - font="SansSerifBigBold" - height="20" - layout="topleft" - left="10" - name="solo_user_name" - text_color="white" - top_delta="3" - translate="false" - value="TestString PleaseIgnore" - use_ellipses="true" - visible="false" - width="275" /> - <text - follows="top|left" - font="SansSerifBigBold" - height="20" - layout="topleft" - left="43" - name="user_name" - text_color="white" - top_delta="0" - translate="false" - value="TestString PleaseIgnore" - use_ellipses="true" - visible="true" - width="250" /> - <text - follows="top|left" - font="SansSerifBold" - height="20" - layout="topleft" - left_delta="0" - name="user_name_small" - text_color="white" - top_delta="-4" - translate="false" - value="TestString PleaseIgnore" - use_ellipses="true" - visible="false" - wrap="true" - width="245" /> - <text - follows="top|left" - height="13" - layout="topleft" - left="10" - name="user_label" - text_color="LtGray" - top_pad="8" - value="Username:" - width="70" /> - <text - follows="top|left" - height="20" - layout="topleft" - left_pad="0" - name="user_slid" - text_color="EmphasisColor" - font="SansSerifBold" - top_delta="-2" - translate="false" - use_ellipses="true" - value="teststring.pleaseignore" - wrap="true" - width="205" /> - <panel - name="lifes_images_panel" - follows="left|top|right" - height="244" - layout="topleft" - top="65" - left="0" - width="292"> - <panel - follows="left|top" - height="117" - layout="topleft" - left="10" - name="second_life_image_panel" - top="0" - width="282"> - <text - follows="left|top|right" - font.style="BOLD" - height="15" - layout="topleft" - left="0" - top="10" - name="second_life_photo_title_text" - text_color="white" - value="[SECOND_LIFE]:" - width="100" /> - <texture_picker - allow_no_texture="true" - default_image_name="None" - enabled="false" - fallback_image="default_profile_picture.j2c" - follows="top|left" - height="124" - layout="topleft" - left="1" - name="2nd_life_pic" - top_pad="0" - width="102" /> - </panel> - <icon - height="102" - image_name="spacer24.tga" - layout="topleft" - name="2nd_life_edit_icon" - label="" - left="11" - top_pad="-92" - tool_tip="Click to select an image" - width="102" /> - </panel> - <text_editor - type="string" - length="1" - follows="left|top|right" - font="SansSerifSmall" - height="102" - layout="topleft" - left="123" - top="90" - max_length="512" - name="sl_description_edit" - width="157" - word_wrap="true"> - </text_editor> - <panel - follows="left|top" - height="117" - layout="topleft" - top_pad="5" - left="10" - name="first_life_image_panel" - width="285"> - <text - follows="left|top|right" - font.style="BOLD" - height="15" - layout="topleft" - left="0" - top_pad="10" - name="real_world_photo_title_text" - text_color="white" - value="Real World:" - width="100" /> - <texture_picker - allow_no_texture="true" - default_image_name="None" - enabled="false" - fallback_image="Generic_Person_Large" - follows="top|left" - height="124" - layout="topleft" - left="1" - name="real_world_pic" - top_pad="0" - width="102" /> - </panel> - <icon - height="102" - image_name="spacer24.tga" - layout="topleft" - name="real_world_edit_icon" - label="" - left="11" - top_pad="-92" - tool_tip="Click to select an image" - width="102" /> - <text_editor - type="string" - length="1" - follows="left|top|right" - font="SansSerifSmall" - height="102" - layout="topleft" - left="123" - max_length="512" - top="223" - name="fl_description_edit" - width="157" - word_wrap="true"> - </text_editor> - <text - type="string" - length="1" - follows="left|top" - font="SansSerifSmall" - font.style="BOLD" - height="15" - layout="topleft" - left="10" - name="title_homepage_text" - text_color="white" - top_pad="10" - width="100"> - Homepage: - </text> - <line_editor - follows="left|top|right" - font="SansSerifSmall" - height="20" - layout="topleft" - left="10" - top_pad="0" - value="http://" - name="homepage_edit" - width="272"> - </line_editor> - <text - follows="left|top" - font="SansSerifSmall" - font.style="BOLD" - height="15" - layout="topleft" - left="10" - name="title_acc_status_text" - text_color="white" - top_pad="10" - value="My Account:" - width="100" /> - <text_editor - allow_scroll="false" - bg_visible="false" - follows="left|top|right" - h_pad="0" - height="28" - layout="topleft" - left="10" - name="acc_status_text" - read_only="true" - top_pad="5" - v_pad="0" - value="Resident. No payment info on file." - width="200" - word_wrap="true" /> - <text - type="string" - follows="left|top" - font="SansSerifSmall" - height="15" - layout="topleft" - left="10" - name="my_account_link" - value="[[URL] Go to My Dashboard]" - width="200" /> - <text - follows="left|top" - font="SansSerifSmall" - font.style="BOLD" - height="15" - layout="topleft" - left="10" - name="title_partner_text" - text_color="white" - top_pad="10" - value="My Partner:" - width="150" /> - <panel - follows="left|top|right" - height="15" - layout="topleft" - left="10" - name="partner_data_panel" - width="200"> - <text - follows="left|top|right" - height="12" - initial_value="(retrieving)" - layout="topleft" - left="0" - name="partner_text" - top="0" - use_ellipses="true" - width="280"/> - </panel> - <text - follows="left|top" - height="15" - layout="topleft" - link="true" - left="10" - name="partner_edit_link" - value="[[URL] Edit]" - width="70" /> - </panel> - </panel> - </scroll_container> - <panel - follows="bottom|left|right" - height="28" - left="0" - name="profile_me_buttons_panel" - top_pad="0" - width="313"> - - <layout_stack - follows="bottom|left|right" - height="28" - layout="topleft" - name="bottom_panel_ls" - left="7" - orientation="horizontal" - top_pad="0" - width="295"> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - name="save_changes_btn_lp" - top="0" - auto_resize="true" - width="153"> - <button - follows="bottom|left|right" - height="23" - label="Save Changes" - layout="topleft" - left="1" - name="save_btn" - top="0" - width="152" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - name="show_on_map_btn_lp" - top="0" - auto_resize="true" - width="154"> - <button - follows="bottom|left|right" - height="23" - label="Cancel" - layout="topleft" - left="1" - name="cancel_btn" - top="0" - width="153" /> - </layout_panel> - </layout_stack> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml new file mode 100644 index 0000000000..b72af7221e --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + name="group_list_item" + top="0" + left="0" + height="16" + width="320" + follows="top|right|left" + layout="topleft" +> + <icon + name="hovered_icon" + top="0" + left="0" + height="16" + width="320" + follows="top|right|left" + layout="topleft" + image_name="ListItem_Over" + visible="false" + /> + <icon + name="selected_icon" + top="0" + left="0" + height="16" + width="320" + follows="top|right|left" + layout="topleft" + image_name="ListItem_Select" + visible="false" + /> + <group_icon + name="group_icon" + top="2" + left="5" + height="14" + width="14" + image_name="Generic_Group" + mouse_opaque="true" + use_draw_context_alpha="false" + /> + <text + name="group_name" + value="Unknown" + top="2" + left_pad="5" + right="-2" + height="16" + follows="left|right" + layout="topleft" + parse_urls="false" + text_color="ScrollUnselectedColor" + use_ellipses="true" + /> + <button + name="visibility_hide_btn" + tool_tip="Hide group on my profile" + top_delta="-3" + left_pad="3" + right="-53" + height="20" + width="20" + follows="right" + image_pressed="Profile_Group_Visibility_Off_Pressed" + image_unselected="Profile_Group_Visibility_Off" + tab_stop="false" + visible="false" + /> + <button + name="visibility_show_btn" + tool_tip="Show group on my profile" + top_delta="0" + right_delta="0" + height="20" + width="20" + follows="right" + image_pressed="Profile_Group_Visibility_On_Pressed" + image_unselected="Profile_Group_Visibility_On" + tab_stop="false" + visible="false" + /> + <button + name="info_btn" + tool_tip="More info" + top_delta="2" + left_pad="3" + right="-30" + height="16" + width="16" + follows="right" + image_pressed="Info_Press" + image_unselected="Info_Over" + tab_stop="false" + /> + <!--*TODO: Should only appear on rollover--> + <button + name="profile_btn" + tool_tip="View profile" + top_delta="-2" + left_pad="5" + right="-3" + height="20" + width="20" + follows="right" + layout="topleft" + image_overlay="Web_Profile_Off" + tab_stop="false" + /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml deleted file mode 100644 index 23e7814cad..0000000000 --- a/indra/newview/skins/default/xui/en/panel_me.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - background_visible="true" - border="false" - follows="all" - height="570" - label="My Profile" - layout="topleft" - left="0" - name="panel_me" - top="0" - width="333"> - <panel - class="panel_picks" - filename="panel_picks.xml" - label="MY PICKS" - help_topic="panel_my_picks_tab" - name="panel_picks"/> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml deleted file mode 100644 index 99c47eb825..0000000000 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - background_visible="true" - follows="all" - height="570" - layout="topleft" - left="0" - min_height="350" - name="panel_pick_info" - help_topic="profile_pick_info" - top="0" - width="333"> - <button - follows="top|left" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" - layout="topleft" - name="back_btn" - left="10" - tab_stop="false" - top="2" - width="30" - use_draw_context_alpha="false" /> - <text - follows="top|left|right" - font="SansSerifHugeBold" - height="26" - layout="topleft" - left_pad="4" - name="title" - text_color="LtGray" - top="2" - value="Pick Info" - use_ellipses="true" - width="275" /> - <scroll_container - color="DkGray2" - opaque="true" - follows="all" - height="503" - layout="topleft" - left="8" - top_pad="10" - name="profile_scroll" - width="312"> - <panel - name="scroll_content_panel" - follows="left|top|right" - min_height="300" - layout="topleft" - top="0" - background_visible="false" - height="400" - left="0" - width="285"> - <texture_picker - fallback_image="default_land_picture.j2c" - enabled="false" - follows="left|top|right" - height="197" - layout="topleft" - left="11" - name="pick_snapshot" - top="10" - width="272" /> - <text_editor - allow_scroll="false" - bg_visible="false" - follows="left|top|right" - h_pad="0" - height="35" - width="280" - layout="topleft" - font="SansSerifBig" - font.style="BOLD" - left="10" - top_pad="10" - name="pick_name" - read_only="true" - text_color="white" - v_pad="0" - value="[name]" - use_ellipses="true" /> - <text_editor - allow_scroll="false" - bg_visible="false" - follows="left|top|right" - h_pad="0" - height="25" - layout="topleft" - left="10" - name="pick_location" - read_only="true" - width="280" - word_wrap="true" - v_pad="0" - value="[loading...]" /> - <text_editor - bg_readonly_color="DkGray2" - follows="all" - height="100" - width="280" - parse_urls="true" - layout="topleft" - left="10" - top_pad="2" - max_length="1023" - name="pick_desc" - read_only="true" - text_readonly_color="white" - value="[description]" - wrap="true" /> - </panel> - </scroll_container> - <panel - follows="left|right|bottom" - height="23" - layout="topleft" - top_pad="5" - left="8" - name="buttons"> - - <layout_stack - follows="bottom|left|right" - height="23" - layout="topleft" - name="layout_stack1" - left="0" - orientation="horizontal" - top_pad="0" - width="312"> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left="0" - name="layout_panel1" - auto_resize="true" - width="101"> - <button - follows="bottom|left|right" - height="23" - label="Teleport" - layout="topleft" - name="teleport_btn" - top="0" - width="101" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - name="show_on_map_btn_lp" - auto_resize="true" - width="100"> - <button - follows="bottom|left|right" - height="23" - label="Map" - layout="topleft" - name="show_on_map_btn" - top_pad="0" - width="100" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - name="edit_btn_lp" - auto_resize="true" - width="101"> - <button - follows="bottom|left|right" - height="23" - label="Edit" - layout="topleft" - name="edit_btn" - top_pad="0" - width="101" /> - </layout_panel> - </layout_stack> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml deleted file mode 100644 index 8def96cada..0000000000 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ /dev/null @@ -1,227 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel -bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true" - follows="all" - height="571" - label="Picks" - layout="topleft" - left="8" - name="panel_picks" - top_pad="0" - width="313"> - <string - name="no_picks" - value="No Picks" /> - <string - name="no_classifieds" - value="No Classifieds" /> - <text - type="string" - follows="all" - height="535" - layout="topleft" - left="6" - name="picks_panel_text" - wrap="true" - top="10" - width="313"/> - <accordion - fit_parent="true" - follows="all" - height="514" - layout="topleft" - left="0" - name="accordion" - top="0" - single_expansion="true" - width="313"> - <accordion_tab - layout="topleft" - height="235" - min_height="150" - name="tab_picks" - title="Picks" - visible="false"> - <flat_list_view - color="DkGray2" - follows="all" - layout="topleft" - left="0" - name="picks_list" - opaque="true" - top="0" - width="313" /> - </accordion_tab> - <accordion_tab - layout="topleft" - height="235" - name="tab_classifieds" - title="Classifieds" - visible="false"> - <flat_list_view - color="DkGray2" - follows="all" - layout="topleft" - left="0" - name="classifieds_list" - opaque="true" - top="0" - width="313" /> - </accordion_tab> - </accordion> - <panel - bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true" - bevel_style="none" - enabled="false" - follows="bottom|left|right" - left="1" - height="27" - label="bottom_panel" - layout="topleft" - name="edit_panel" - top_pad="0" - width="312"> - - <layout_stack - follows="bottom|left|right" - height="23" - layout="bottomleft" - name="edit_panel_ls" - left="10" - orientation="horizontal" - top_pad="0" - width="293"> - - <layout_panel - follows="bottom|left" - height="18" - layout="bottomleft" - left="0" - name="gear_menu_btn" - auto_resize="true" - width="51"> - <button - follows="bottom|left" - height="18" - image_disabled="AddItem_Disabled" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - layout="topleft" - left="0" - name="new_btn" - tool_tip="Create a new pick or classified at the current location" - top="0" - width="18" /> - </layout_panel> - - <layout_panel - follows="bottom|right" - height="18" - layout="bottomleft" - name="trash_btn_lp" - auto_resize="true" - width="18"> - <button - follows="bottom|right" - height="18" - image_disabled="TrashItem_Disabled" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" - layout="topleft" - name="trash_btn" - top="0" - width="18" /> - </layout_panel> - - </layout_stack> - </panel> - - <panel - bg_opaque_color="DkGray" - background_visible="true" - background_opaque="true" - follows="bottom|left|right" - layout="topleft" - left="0" - height="30" - name="buttons_cucks" - top_pad="0" - width="313"> - - <layout_stack - follows="bottom|left|right" - height="28" - layout="topleft" - left="2" - name="buttons_cucks_ls" - orientation="horizontal" - top="0" - width="313"> - - <layout_panel - follows="bottom|left|right" - height="28" - layout="topleft" - left="0" - name="info_btn_lp" - auto_resize="true" - top="0" - width="95"> - <button - enabled="false" - follows="top|left|right" - height="23" - label="Info" - layout="topleft" - name="info_btn" - tab_stop="false" - tool_tip="Show pick information" - width="95" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="28" - layout="bottomleft" - left_pad="2" - name="teleport_btn_lp" - auto_resize="true" - width="117"> - <button - enabled="false" - follows="top|left|right" - height="23" - label="Teleport" - layout="topleft" - name="teleport_btn" - tab_stop="false" - tool_tip="Teleport to the corresponding area" - width="117" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="28" - layout="bottomleft" - name="show_on_map_btn_lp" - auto_resize="true" - left_pad="2" - width="90"> - <button - enabled="false" - follows="top|left|right" - height="23" - label="Map" - layout="topleft" - name="show_on_map_btn" - tab_stop="false" - tool_tip="Show the corresponding area on the World Map" - width="88" /> - </layout_panel> - </layout_stack> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml new file mode 100644 index 0000000000..c9e8b242d4 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml @@ -0,0 +1,830 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + name="panel_profile_classified" + top="0" + left="0" + height="420" + width="315" + follows="all" + layout="topleft" + help_topic="panel_profile_classified" + min_height="250" +> + <panel.string + name="type_mature" + > + Moderate + </panel.string> + <panel.string + name="type_pg" + > + General Content + </panel.string> + <panel.string + name="l$_price" + > + L$[PRICE] + </panel.string> + <panel.string + name="click_through_text_fmt" + > + [TELEPORT] teleport, [MAP] map, [PROFILE] profile + </panel.string> + <panel.string + name="date_fmt" + > + [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] + </panel.string> + <panel.string + name="auto_renew_on" + > + Enabled + </panel.string> + <panel.string + name="auto_renew_off" + > + Disabled + </panel.string> + <panel.string + name="location_notice" + > + (will update after save) + </panel.string> + <string + name="publish_label" + > + Publish + </string> + <string + name="save_label" + > + Save + </string> + + <layout_stack + name="main_classifieds_stack" + top="0" + bottom="-1" + left="0" + width="310" + follows="all" + layout="topleft" + orientation="vertical" + animate="false" + > + <layout_panel + follows="all" + width="310" + height="300" + layout="topleft" + name="scroll_layout_panel" + auto_resize="true"> + <scroll_container + name="profile_scroll" + top="0" + left="0" + height="300" + width="310" + follows="all" + layout="topleft" + color="DkGray2" + opaque="true" + reserve_scroll_corner="false" + > + <panel + name="info_scroll_content_panel" + top="0" + left="0" + height="562" + width="280" + follows="left|top|right" + layout="topleft" + background_visible="false" + min_height="200" + > + <texture_picker + name="classified_snapshot" + enabled="false" + top="0" + left="10" + height="161" + width="260" + follows="left|top" + layout="topleft" + fallback_image="default_land_picture.j2c" + /> + <icon + name="edit_icon" + label="" + tool_tip="Click to select an image" + top="0" + left="0" + height="161" + width="260" + layout="topleft" + follows="left|top" + image_name="spacer24.tga" + visible="false" + /> + <layout_stack + name="info_panel" + top="145" + left="0" + height="375" + width="310" + follows="all" + layout="topleft" + visible="true" + animate="false" + orientation="vertical" + > + <layout_panel + name="main_info_panel" + top="0" + left="0" + height="160" + width="280" + follows="all" + layout="topleft" + auto_resize="false" + > + <text_editor + name="classified_name" + top="0" + left="10" + height="35" + width="270" + follows="left|top|right" + layout="topleft" + allow_scroll="false" + bg_visible="false" + font="SansSerifBig" + font.style="BOLD" + h_pad="0" + read_only="true" + text_color="white" + use_ellipses="true" + v_pad="0" + > + [name] + </text_editor> + <text + name="classified_location_label" + value="Location:" + top_pad="-2" + left="10" + height="10" + width="250" + follows="left|top" + layout="topleft" + font.style="BOLD" + text_color="white" + /> + <text_editor + name="classified_location" + value="[loading...]" + top_pad="5" + left="10" + height="30" + width="280" + follows="left|top" + layout="topleft" + allow_scroll="false" + bg_visible="false" + h_pad="0" + read_only="true" + v_pad="0" + word_wrap="true" + /> + <text + name="content_type_label" + value="Content Type:" + top_pad="10" + left="10" + height="10" + width="140" + follows="left|top" + layout="topleft" + font.style="BOLD" + text_color="white" + /> + <icon + name="content_type_moderate" + top_pad="-11" + left_pad="0" + height="16" + width="18" + follows="top|left" + layout="topleft" + image_name="Parcel_M_Light" + /> + <icon + name="content_type_general" + top_delta="0" + left_delta="0" + height="16" + width="18" + follows="top|left" + layout="topleft" + image_name="Parcel_PG_Light" + /> + <text_editor + name="content_type" + value="[content type]" + top_delta="1" + left_pad="2" + height="18" + width="130" + follows="left|top|right" + layout="topleft" + allow_scroll="false" + bg_visible="false" + h_pad="0" + read_only="true" + v_pad="0" + /> + <text + name="category_label" + value="Category:" + top_pad="0" + left="10" + height="10" + width="140" + follows="left|top" + layout="topleft" + font.style="BOLD" + text_color="white" + /> + <text_editor + name="category" + value="[category]" + top_pad="-10" + left_pad="0" + height="18" + width="150" + follows="left|top|right" + layout="topleft" + allow_scroll="false" + bg_visible="false" + h_pad="0" + parse_urls="true" + read_only="true" + v_pad="0" + /> + <text + name="creation_date_label" + value="Creation date:" + top_pad="0" + left="10" + height="10" + width="140" + follows="left|top" + layout="topleft" + font.style="BOLD" + text_color="white" + /> + <text_editor + name="creation_date" + value="[date]" + tool_tip="Creation date" + top_pad="-10" + left_pad="0" + height="16" + width="150" + follows="left|top" + layout="topleft" + allow_scroll="false" + bg_visible="false" + h_pad="0" + halign="left" + read_only="true" + v_pad="0" + /> + <text + name="price_for_listing_label" + value="Price for listing:" + top_pad="5" + left="10" + height="10" + width="140" + follows="left|top" + layout="topleft" + font.style="BOLD" + text_color="white" + /> + <text_editor + name="price_for_listing" + tool_tip="Price for listing." + top_pad="-10" + left_pad="0" + height="16" + width="105" + follows="left|top" + layout="topleft" + allow_scroll="false" + bg_visible="false" + h_pad="0" + halign="left" + read_only="true" + v_pad="0" + > + [PRICE] + </text_editor> + </layout_panel> + <layout_panel + name="clickthrough_layout_panel" + top="0" + left="0" + height="16" + width="290" + follows="all" + layout="topleft" + auto_resize="false" + > + <text + name="click_through_label" + value="Clicks:" + top_pad="0" + left="10" + height="10" + width="140" + follows="left|top" + layout="topleft" + font.style="BOLD" + text_color="white" + /> + <text_editor + name="click_through_text" + value="[clicks]" + tool_tip="Click through data" + top_pad="-10" + left_pad="0" + height="16" + width="150" + follows="left|top" + layout="topleft" + allow_scroll="false" + bg_visible="false" + h_pad="0" + halign="left" + read_only="true" + v_pad="0" + /> + </layout_panel> + <layout_panel + name="auto_renew_layout_panel" + top="0" + left="0" + height="16" + width="290" + follows="all" + layout="topleft" + auto_resize="false" + > + <text + name="auto_renew_label" + value="Auto renew:" + top="0" + left="10" + height="10" + width="140" + follows="left|top" + layout="topleft" + font.style="BOLD" + text_color="white" + /> + <text + name="auto_renew" + value="Enabled" + top_pad="-10" + left_pad="0" + height="16" + width="150" + follows="top|left" + layout="topleft" + /> + </layout_panel> + <layout_panel + name="descr_layout_panel" + top="0" + left="0" + height="220" + width="290" + follows="all" + layout="topleft" + auto_resize="true" + > + <text + name="classified_desc_label" + value="Description:" + top="0" + left="10" + height="10" + width="250" + follows="left|top" + layout="topleft" + font.style="BOLD" + text_color="white" + /> + <text_editor + name="classified_desc" + trusted_content="false" + value="[description]" + top_pad="7" + left="10" + height="200" + width="280" + follows="all" + layout="topleft" + allow_scroll="false" + bg_visible="false" + h_pad="0" + max_length="1023" + parse_urls="true" + read_only="true" + v_pad="0" + word_wrap="true" + /> + </layout_panel> + </layout_stack> + <panel + name="edit_panel" + top="145" + left="0" + height="420" + width="320" + follows="left|top|right" + layout="topleft" + visible="false" + > + <text + name="Name:" + top="0" + left="10" + height="15" + width="280" + follows="left|top" + layout="topleft" + font="SansSerifSmall" + font.style="BOLD" + length="1" + text_color="white" + type="string" + > + Title: + </text> + <line_editor + name="classified_name_edit" + top_pad="2" + left="10" + height="20" + width="273" + follows="left|top|right" + layout="topleft" + font="SansSerif" + max_length_bytes="30" + prevalidate_callback="ascii" + commit_on_focus_lost="false" + text_color="black" + /> + <text + name="description_label" + top_pad="10" + left="10" + height="15" + width="280" + follows="left|top" + layout="topleft" + font="SansSerifSmall" + font.style="BOLD" + length="1" + text_color="white" + type="string" + > + Description: + </text> + <text_editor + name="classified_desc_edit" + top_pad="2" + left="10" + height="100" + width="273" + follows="left|top|right" + layout="topleft" + max_length="256" + text_color="black" + word_wrap="true" + /> + <text + name="location_label" + top_pad="10" + left="10" + height="15" + width="280" + follows="left|top" + layout="topleft" + font="SansSerifSmall" + font.style="BOLD" + length="1" + text_color="white" + type="string" + > + Location: + </text> + <text + name="classified_location_edit" + top_pad="2" + left="10" + right="-10" + height="30" + width="280" + follows="left|top" + layout="topleft" + length="1" + type="string" + word_wrap="true" + > + loading... + </text> + <button + name="set_to_curr_location_btn" + label="Set to Current Location" + top_pad="5" + left="10" + height="23" + width="200" + follows="left|top" + layout="topleft" + /> + <text + name="category_label" + value="Category:" + top_pad="10" + left="10" + height="10" + width="120" + follows="left|top" + layout="topleft" + font.style="BOLD" + text_color="white" + /> + <combo_box + name="category_edit" + label="" + top_delta="-3" + left_pad="0" + height="23" + width="156" + follows="left|top" + /> + <text + name="content_type_label" + value="Content type:" + top_pad="15" + left="10" + height="10" + width="120" + follows="left|top" + layout="topleft" + font.style="BOLD" + text_color="white" + /> + <icons_combo_box + name="content_type_edit" + label="General Content" + top_delta="-3" + left_pad="0" + height="23" + width="156" + follows="left|top" + layout="topleft" + > + <icons_combo_box.drop_down_button + image_overlay="Parcel_PG_Light" + image_overlay_alignment="left" + imgoverlay_label_space="3" + pad_left="3" + /> + <icons_combo_box.item + name="mature_ci" + label="Moderate Content" + value="Mature" + > + <item.columns + value="Parcel_M_Light" + width="20" + halign="center" + type="icon" + /> + </icons_combo_box.item> + <icons_combo_box.item + name="pg_ci" + label="General Content" + value="PG" + > + <item.columns + value="Parcel_PG_Light" + width="20" + halign="center" + type="icon" + /> + </icons_combo_box.item> + </icons_combo_box> + <check_box + name="auto_renew_edit" + label="Auto renew each week" + top_pad="10" + left="10" + height="16" + width="250" + layout="topleft" + /> + </panel> + </panel> + </scroll_container> + </layout_panel> + + <layout_panel + follows="all" + width="310" + height="25" + layout="topleft" + name="util_buttons_lp" + auto_resize="true"> + <layout_stack + name="util_buttons_stack" + bottom="-1" + left="1" + right="-1" + height="25" + follows="left|bottom|right" + layout="topleft" + orientation="horizontal" + animate="false" + > + <layout_panel + follows="all" + layout="topleft" + name="util_resizer_left" + auto_resize="true" + user_resize="false" + width="1"/> + + <layout_panel + follows="all" + height="25" + layout="topleft" + left="0" + name="teleport_btn_lp" + auto_resize="false" + top="0" + width="85"> + <button + name="teleport_btn" + label="Teleport" + top="0" + left="0" + height="23" + max_width="101" + width="85" + follows="bottom|left|right" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + height="25" + layout="bottomleft" + left_pad="2" + name="map_btn_lp" + auto_resize="false" + max_width="101" + width="85"> + <button + name="show_on_map_btn" + label="Map" + top="0" + left="0" + height="23" + width="85" + follows="bottom|left|right" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + height="25" + layout="bottomleft" + left_pad="2" + name="edit_btn_lp" + auto_resize="false" + max_width="101" + width="85"> + <button + name="edit_btn" + label="Edit" + top="0" + left="0" + height="23" + width="85" + follows="bottom|left|right" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + layout="topleft" + name="util_resizer_right" + auto_resize="true" + width="1"> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel + follows="all" + width="310" + height="41" + layout="topleft" + name="publish_layout_panel" + auto_resize="false"> + <view_border + bevel_style="none" + height="0" + follows="left|top|right" + layout="topleft" + left="0" + name="publish_emphasis_border" + top="5" + width="310"/> + <layout_stack + name="publish_stack" + left="1" + right="-1" + top="11" + height="25" + follows="left|top|right" + layout="topleft" + orientation="horizontal" + animate="false" + > + <layout_panel + follows="all" + layout="topleft" + name="pbl_resizer_left" + auto_resize="true" + user_resize="false" + width="1"/> + + <layout_panel + follows="all" + layout="topleft" + name="save_btn_lp" + auto_resize="false" + width="134"> + <button + name="save_changes_btn" + label="[LABEL]" + top="0" + left="0" + left_pad="5" + height="23" + width="134" + follows="left|top" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + layout="bottomleft" + left_pad="2" + name="cancel_btn_lp" + auto_resize="false" + width="134"> + <button + name="cancel_btn" + label="Cancel" + top="0" + left="0" + height="23" + width="134" + follows="left|top" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + layout="topleft" + name="pbl_resizer_right" + auto_resize="true" + width="1"> + </layout_panel> + + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml new file mode 100644 index 0000000000..2b2f60e0c2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml @@ -0,0 +1,142 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + name="panel_profile_classifieds" + label="Classified" + top="0" + left="0" + height="480" + width="420" + follows="all" + layout="topleft" +> + <string + name="no_classifieds" + value="No Classifieds" + /> + + <layout_stack + name="main_stack" + top="0" + left="0" + right="-1" + bottom="-1" + follows="all" + layout="topleft" + animate="false" + orientation="vertical"> + <layout_panel + name="buttons_header" + follows="all" + layout="topleft" + height="50" + auto_resize="false" + user_resize="false"> + <button + name="new_btn" + label="New..." + tool_tip="Create a new classified at the current location" + enabled="false" + top="25" + left="5" + height="20" + width="70" + follows="left|top" + layout="topleft" + visible="true" + /> + <button + name="delete_btn" + label="Delete..." + tool_tip="Delete currently selected classified" + enabled="false" + left_pad="5" + height="20" + width="70" + follows="left|top" + layout="topleft" + visible="true" + /> + </layout_panel> + <layout_panel + name="main_body" + follows="all" + layout="topleft" + height="430" + auto_resize="true" + user_resize="false"> + <tab_container + name="tab_classifieds" + top="0" + bottom="-1" + left="4" + right="-4" + follows="all" + layout="topleft" + halign="left" + tab_position="left" + tab_width="150" + use_ellipses="true" + /> + + <layout_stack + name="indicator_stack" + top="220" + left="0" + right="-1" + height="28" + follows="top|left|right" + layout="topleft" + animate="false" + orientation="horizontal"> + <layout_panel + name="indicator_spacer_left" + follows="all" + layout="topleft" + width="100" + auto_resize="true" + user_resize="false"> + </layout_panel> + <layout_panel + name="buttons_header" + follows="all" + layout="topleft" + width="25" + auto_resize="false" + user_resize="false"> + <loading_indicator + name="progress_indicator" + top="1" + left="1" + height="23" + width="23" + follows="top|left" + layout="topleft" + visible="false" + /> + </layout_panel> + <layout_panel + name="indicator_spacer_right" + follows="all" + layout="topleft" + width="100" + auto_resize="true" + user_resize="false"> + </layout_panel> + </layout_stack> + <text + name="classifieds_panel_text" + top="250" + left="110" + right="-110" + height="25" + follows="left|top|right" + layout="topleft" + halign="center" + mouse_opaque="false" + wrap="true" + > + Loading... + </text> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml new file mode 100644 index 0000000000..ca1e405a62 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + name="panel_profile_firstlife" + label="Profile" + top="0" + left="0" + height="480" + width="420" + follows="all" + layout="topleft" +> + <loading_indicator + name="progress_indicator" + top="5" + right="-10" + height="23" + width="23" + follows="top|right" + layout="topleft" + visible="false" + /> + <icon + name="real_world_pic" + image_name="Generic_Person_Large" + follows="top|left" + layout="topleft" + top="10" + left="8" + height="160" + width="160"/> + <loading_indicator + name="image_upload_indicator" + top="79" + left="77" + height="23" + width="23" + follows="top|left" + layout="topleft" + visible="false"/> + <button + name="fl_upload_image" + label="Upload Photo" + top="102" + left="175" + height="20" + width="120" + follows="top|left" + layout="topleft"/> + <button + name="fl_change_image" + label="Change Photo" + top_pad="5" + left="175" + height="20" + width="120" + follows="top|left" + layout="topleft"/> + <button + name="fl_remove_image" + label="Remove Photo" + top_pad="5" + left_delta="0" + height="20" + width="120" + follows="top|left" + layout="topleft"/> + <text_editor + name="fl_description_edit" + trusted_content="false" + enabled="false" + top="180" + left="6" + right="-6" + height="224" + follows="all" + layout="topleft" + bg_readonly_color="Transparent" + border_visible="true" + max_length="65000" + parse_urls="true" + word_wrap="true" + /> + <button + name="fl_save_changes" + label="Save" + top_pad="5" + right="-108" + height="20" + width="80" + enabled="false" + follows="right|bottom" + layout="topleft"/> + <button + name="fl_discard_changes" + label="Discard" + top_delta="0" + right="-4" + height="20" + width="100" + enabled="false" + follows="right|bottom" + layout="topleft"/> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_notes.xml b/indra/newview/skins/default/xui/en/panel_profile_notes.xml new file mode 100644 index 0000000000..16e7365042 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_notes.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + name="panel_notes" + label="Notes & Privacy" + top="0" + left="0" + height="480" + width="420" + follows="all" + layout="topleft" +> + <loading_indicator + name="progress_indicator" + top="3" + right="-10" + height="23" + width="23" + follows="top|right" + layout="topleft" + visible="false" + /> + <text + name="status_message" + value="Make notes about this person here. No one else can see your notes." + top="6" + left="6" + right="-6" + height="16" + follows="left|top|right" + layout="topleft" + font.style="BOLD" + /> + <text_editor + name="notes_edit" + enabled="false" + top="28" + left="6" + right="-6" + bottom="-26" + follows="all" + layout="topleft" + max_length="65530" + word_wrap="true" + /> + <button + name="notes_save_changes" + label="Save" + bottom="-1" + right="-108" + height="20" + width="80" + enabled="false" + follows="bottom|right" + layout="topleft"/> + <button + name="notes_discard_changes" + label="Discard" + bottom="-1" + right="-4" + height="20" + width="100" + enabled="false" + follows="bottom|right" + layout="topleft"/> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_pick.xml b/indra/newview/skins/default/xui/en/panel_profile_pick.xml new file mode 100644 index 0000000000..3e91640093 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml @@ -0,0 +1,314 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + name="panel_pick_info" + top="0" + left="0" + height="360" + width="310" + follows="all" + layout="topleft" + help_topic="profile_pick_info" +> + <panel.string + name="location_notice" + > + (will update after save) + </panel.string> + + <layout_stack + name="main_pick_stack" + left="1" + right="-1" + top="0" + bottom="-1" + follows="all" + layout="topleft" + orientation="vertical" + animate="false"> + <layout_panel + follows="all" + layout="bottomleft" + left_pad="2" + name="main_pick_lp" + auto_resize="true" + height="314"> + <texture_picker + name="pick_snapshot" + top="10" + left="10" + height="161" + width="260" + follows="left|top" + layout="topleft" + fallback_image="default_land_picture.j2c" + /> + <text + name="title_label" + top_pad="-15" + left="10" + height="15" + width="280" + follows="left|top" + layout="topleft" + font="SansSerifSmall" + font.style="BOLD" + length="1" + text_color="white" + type="string" + > + Title: + </text> + <line_editor + name="pick_name" + enabled="false" + top_pad="2" + left="10" + height="20" + width="290" + follows="left|right|top" + layout="topleft" + /> + <text + name="description_label" + top_pad="10" + left="10" + height="15" + width="280" + follows="left|top" + layout="topleft" + font="SansSerifSmall" + font.style="BOLD" + length="1" + text_color="white" + type="string" + > + Description: + </text> + <text_editor + name="pick_desc" + trusted_content="false" + always_show_icons="true" + enabled="false" + top_pad="2" + left="10" + height="45" + width="290" + follows="all" + layout="topleft" + allow_html="true" + border_visible="true" + h_pad="4" + max_length="1023" + v_pad="3" + word_wrap="true" + /> + <text + name="location_label" + bottom="-25" + left="10" + height="15" + width="280" + follows="left|right|bottom" + layout="topleft" + font="SansSerifSmall" + font.style="BOLD" + length="1" + text_color="white" + type="string" + > + Location: + </text> + <line_editor + name="pick_location" + enabled="false" + bottom="-1" + left="10" + height="23" + width="290" + follows="left|right|bottom" + layout="topleft" + length="1" + type="string" + > + Loading... + </line_editor> + </layout_panel> + + + <layout_panel + follows="all" + layout="bottomleft" + name="save_changes_lp" + auto_resize="false" + height="25"> + <layout_stack + name="save_changes_stack" + left="1" + right="-1" + top="0" + height="25" + follows="left|top|right" + layout="topleft" + orientation="horizontal" + animate="false"> + + <layout_panel + follows="all" + layout="topleft" + name="util_resizer_left" + auto_resize="true" + width="1"> + </layout_panel> + + <layout_panel + follows="all" + layout="bottomleft" + left_pad="2" + name="map_btn_lp" + auto_resize="false" + width="100"> + <button + name="show_on_map_btn" + label="Show on Map" + left="0" + top="0" + height="23" + width="100" + follows="left|top" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + layout="bottomleft" + left_pad="2" + name="tp_btn_lp" + auto_resize="false" + width="100"> + <button + name="teleport_btn" + label="Teleport" + left="0" + top="0" + height="23" + width="100" + follows="left|top" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + layout="topleft" + name="util_resizer_right" + auto_resize="true" + width="1"> + </layout_panel> + + </layout_stack> + </layout_panel> + + <layout_panel + follows="all" + layout="bottomleft" + name="save_changes_lp" + auto_resize="false" + height="41"> + <view_border + bevel_style="none" + height="0" + follows="left|top|right" + layout="topleft" + left="0" + name="save_emphasis_border" + top="5" + width="310"/> + <layout_stack + name="save_changes_stack" + left="1" + right="-1" + top="11" + height="25" + follows="left|top|right" + layout="topleft" + orientation="horizontal" + animate="false"> + + <layout_panel + follows="all" + layout="topleft" + name="save_resizer_left" + auto_resize="true" + width="1"> + </layout_panel> + + <layout_panel + follows="all" + layout="bottomleft" + left_pad="2" + name="create_btn_lp" + auto_resize="false" + width="130"> + <button + name="create_changes_btn" + label="Create Pick" + left="0" + top="0" + height="23" + width="130" + follows="left|top" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + layout="bottomleft" + left_pad="2" + name="save_btn_lp" + auto_resize="false" + width="130"> + <button + name="save_changes_btn" + label="Save Pick" + left="0" + top="0" + height="23" + width="130" + follows="left|top" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + layout="bottomleft" + left_pad="2" + name="cancel_btn_lp" + auto_resize="false" + width="130"> + <button + name="cancel_changes_btn" + label="Cancel" + left="0" + top="0" + height="23" + width="130" + follows="left|top" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + layout="topleft" + name="save_resizer_right" + auto_resize="true" + width="1"> + </layout_panel> + + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_picks.xml b/indra/newview/skins/default/xui/en/panel_profile_picks.xml new file mode 100644 index 0000000000..44d5c448c0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_picks.xml @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + name="panel_picks" + label="Picks" + top="0" + left="0" + height="480" + width="420" + follows="all" + layout="topleft" +> + <string + name="no_picks" + value="No Picks" + /> + + <layout_stack + name="main_stack" + top="0" + left="0" + right="-1" + bottom="-1" + follows="all" + layout="topleft" + animate="false" + orientation="vertical"> + <layout_panel + name="buttons_header" + follows="all" + layout="topleft" + height="50" + auto_resize="false" + user_resize="false"> + <text + name="header_text" + top="5" + left="5" + right="-5" + height="16" + follows="left|top|right" + layout="topleft" + halign="center" + > + Tell everyone about your favorite places in Second Life. + </text> + <button + name="new_btn" + label="New..." + tool_tip="Create a new pick at the current location" + enabled="false" + top_pad="4" + left="5" + height="20" + width="70" + follows="left|top" + layout="topleft" + visible="false" + /> + <button + name="delete_btn" + label="Delete..." + tool_tip="Delete currently selected pick" + enabled="false" + left_pad="5" + height="20" + width="70" + follows="left|top" + layout="topleft" + visible="false" + /> + </layout_panel> + <layout_panel + name="main_body" + follows="all" + layout="topleft" + height="430" + auto_resize="true" + user_resize="false"> + <tab_container + name="tab_picks" + top="0" + bottom="-5" + left="4" + right="-4" + tab_width="150" + follows="all" + layout="topleft" + halign="left" + tab_position="left" + use_ellipses="true" + /> + + <layout_stack + name="indicator_stack" + top="220" + left="0" + right="-1" + height="28" + follows="top|left|right" + layout="topleft" + animate="false" + orientation="horizontal"> + <layout_panel + name="indicator_spacer_left" + follows="all" + layout="topleft" + width="100" + auto_resize="true" + user_resize="false"> + </layout_panel> + <layout_panel + name="buttons_header" + follows="all" + layout="topleft" + width="25" + auto_resize="false" + user_resize="false"> + <loading_indicator + name="progress_indicator" + top="1" + left="1" + height="23" + width="23" + follows="top|left" + layout="topleft" + visible="false" + /> + </layout_panel> + <layout_panel + name="indicator_spacer_right" + follows="all" + layout="topleft" + width="100" + auto_resize="true" + user_resize="false"> + </layout_panel> + </layout_stack> + <text + name="picks_panel_text" + top="250" + left="100" + right="-100" + height="25" + follows="left|top|right" + layout="topleft" + halign="center" + mouse_opaque="false" + wrap="true" + > + Loading... + </text> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml new file mode 100644 index 0000000000..551b477876 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml @@ -0,0 +1,549 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + name="panel_profile" + label="Profile" + top="0" + left="0" + height="480" + width="420" + follows="all" + layout="topleft" +> + <string + name="date_format" + value="SL birthdate: [mth,datetime,slt] [day,datetime,slt], [year,datetime,slt]" /> + <string + name="age_format" + value="[AGE]" /> + <string + name="partner_text" + value="Partner: [LINK]" /> + <string + name="CaptionTextAcctInfo"> +Account: [ACCTTYPE] +[PAYMENTINFO] + </string> + + <layout_stack + name="image_stack" + top="8" + left="6" + bottom="-1" + width="160" + border_size="0" + follows="left|top|bottom" + layout="topleft" + animate="false" + orientation="vertical"> + <layout_panel + name="image_panel" + follows="all" + layout="topleft" + width="160" + height="160" + auto_resize="false" + user_resize="false"> + + <icon + name="2nd_life_pic" + image_name="Generic_Person_Large" + layout="topleft" + follows="all" + interactable="true" + top="0" + left="2" + bottom="-1" + right="-1"/> + + <loading_indicator + name="image_upload_indicator" + top="69" + left="69" + height="23" + width="23" + follows="top|left" + layout="topleft" + visible="false"/> + </layout_panel> + + <layout_panel + name="basics_panel" + follows="all" + layout="topleft" + height="54" + auto_resize="false" + user_resize="false" + > + <line_editor + name="user_name" + border_thickness="0" + use_bg_color="false" + background_image_disabled="" + background_image_focused="" + enabled="false" + value="(loading...)" + top="4" + left="3" + right="-1" + height="16" + follows="left|top|right" + layout="topleft"/> + + <line_editor + name="sl_birth_date" + border_thickness="0" + use_bg_color="false" + background_image_disabled="" + background_image_focused="" + enabled="false" + value="(loading...)" + top_pad="0" + left_delta="0" + right="-1" + height="16" + follows="left|top|right" + layout="topleft"/> + + <line_editor + name="user_age" + border_thickness="0" + use_bg_color="false" + background_image_disabled="" + background_image_focused="" + enabled="false" + value="(loading...)" + top_pad="0" + left_delta="0" + right="-1" + height="16" + follows="left|top|right" + layout="topleft"/> + </layout_panel> + <layout_panel + name="partner_layout" + follows="all" + layout="topleft" + height="30" + auto_resize="false" + user_resize="false" + visible="true"> + <text + type="string" + name="partner_link" + value="Partner: (loading...)" + top="0" + left="5" + right="-1" + height="28" + follows="left|top|right" + layout="topleft" + translate="false" + use_ellipses="true" + word_wrap="true" + visible="true"/> + </layout_panel> + + <layout_panel + name="partner_spacer_layout" + follows="all" + layout="topleft" + height="14" + auto_resize="false" + user_resize="false" + visible="true"> + </layout_panel> + + <layout_panel + name="frind_layout" + follows="all" + layout="topleft" + height="16" + auto_resize="false" + user_resize="false" + visible="false"> + <text + name="frind_text" + value="You are friends" + text_color="ConversationFriendColor" + top="0" + left="5" + right="-1" + height="16" + follows="left|top|right" + layout="topleft" + translate="false" + visible="true"/> + </layout_panel> + <layout_panel + name="online_layout" + follows="all" + layout="topleft" + height="16" + auto_resize="false" + user_resize="false" + visible="false"> + <icon + name="online_icon" + image_name="Profile_Friend_Online" + layout="topleft" + follows="left|top" + top="0" + left="5" + height="10" + width="10"/> + <text + name="online_text" + value="Online" + top="0" + left="18" + right="-1" + height="16" + follows="left|top|right" + layout="topleft" + translate="false" + visible="true"/> + </layout_panel> + <layout_panel + name="offline_layout" + follows="all" + layout="topleft" + height="16" + auto_resize="false" + user_resize="false" + visible="false"> + <icon + name="offline_icon" + image_name="Profile_Friend_Offline" + layout="topleft" + follows="left|top" + top="0" + left="5" + height="10" + width="10"/> + <text + name="offline_text" + value="Offline" + top="0" + left="18" + right="-1" + height="16" + follows="left|top|right" + layout="topleft" + translate="false" + visible="true"/> + </layout_panel> + <layout_panel + name="account_layout" + follows="all" + layout="topleft" + height="33" + auto_resize="false" + user_resize="false"> + <text + name="account_info" + value="Account: (loading...)" + top="0" + left="5" + right="-1" + height="16" + follows="left|top|right" + layout="topleft" + word_wrap="true"/> + </layout_panel> + <layout_panel + name="indicator_stack" + follows="all" + layout="topleft" + height="33" + auto_resize="false" + user_resize="false"> + <loading_indicator + name="progress_indicator" + left="67" + top="0" + height="23" + width="23" + follows="left|top" + layout="topleft" + visible="true"/> + </layout_panel> + <layout_panel + name="settings_panel" + follows="all" + layout="topleft" + height="50" + auto_resize="false" + user_resize="false"> + <!-- only for self --> + <text + name="search_label" + value="Show my profile in search:" + top="1" + left="6" + right="-1" + height="16" + follows="left|top|right" + layout="topleft"/> + <combo_box + name="show_in_search" + tool_tip="Let people see you in search results" + left="1" + top="18" + height="23" + width="140" + follows="left|top" + layout="topleft" + visible="true" + enabled="false"> + <combo_box.item + name="Hide" + label="Hide" + value="0" /> + <combo_box.item + name="Show" + label="Show" + value="1" /> + </combo_box> + </layout_panel> + + <layout_panel + name="menu_panel" + follows="all" + layout="topleft" + height="55" + auto_resize="false" + user_resize="false" + > + <menu_button + layout="topleft" + follows="left|top" + left="1" + top="25" + height="25" + width="140" + label="Actions" + halign="left" + image_unselected="DropDown_Off" + image_selected="DropDown_On" + image_pressed="DropDown_Press" + image_pressed_selected="DropDown_Press" + image_disabled="DropDown_Disabled" + name="agent_actions_menu" /> + </layout_panel> + </layout_stack> + + <layout_stack + name="main_stack" + top="8" + left="168" + bottom="-1" + right="-1" + follows="all" + layout="topleft" + animate="false" + orientation="vertical"> + <layout_panel + name="display_name_panel" + follows="all" + layout="topleft" + height="24" + auto_resize="false" + user_resize="false"> + <line_editor + name="display_name" + border_thickness="0" + use_bg_color="false" + background_image_disabled="" + background_image_focused="" + enabled="false" + value="(loading...)" + font="SansSerifBigLarge" + top="0" + left="6" + height="19" + right="-86" + follows="left|top|right" + layout="topleft"/> + + <icon + tool_tip="Friend can see my online status" + mouse_opaque="true" + name="can_see_online" + image_name="Profile_Perm_Online_Enabled" + layout="topleft" + follows="right|top" + interactable="true" + top="0" + right="-61" + height="24" + width="24" + left_pad="2" /> + + <icon + tool_tip="Friend can not see my online status" + mouse_opaque="true" + name="cant_see_online" + image_name="Profile_Perm_Online_Disabled" + layout="topleft" + follows="right|top" + interactable="true" + top="0" + right="-61" + height="24" + width="24" + left_pad="2" /> + + <icon + tool_tip="Friend can see me on map" + mouse_opaque="true" + name="can_see_on_map" + image_name="Profile_Perm_Find_Enabled" + layout="topleft" + follows="right|top" + interactable="true" + top="0" + right="-30" + height="24" + width="24" + left_pad="2" /> + + <icon + tool_tip="Friend can not see me on map" + mouse_opaque="true" + name="cant_see_on_map" + image_name="Profile_Perm_Find_Disabled" + layout="topleft" + follows="right|top" + interactable="true" + top="0" + right="-30" + height="24" + width="24" + left_pad="2" /> + + <icon + tool_tip="Friend can edit my objects" + mouse_opaque="true" + name="can_edit_objects" + image_name="Profile_Perm_Objects_Enabled" + layout="topleft" + follows="right|top" + interactable="true" + top="0" + right="-1" + height="24" + width="24" + left_pad="2" /> + + <icon + tool_tip="Friend can not edit my objects" + mouse_opaque="true" + name="cant_edit_objects" + image_name="Profile_Perm_Objects_Disabled" + layout="topleft" + follows="right|top" + interactable="true" + top="0" + right="-1" + height="24" + width="24" + left_pad="2" /> + + </layout_panel> + + <layout_panel + name="about_panel" + follows="all" + layout="topleft" + height="159" + auto_resize="true" + user_resize="false"> + <text_editor + name="sl_description_edit" + trusted_content="false" + always_show_icons="true" + commit_on_focus_lost="false" + enabled="false" + top="0" + left="2" + right="-1" + bottom="-1" + follows="all" + layout="topleft" + bg_readonly_color="Transparent" + border_visible="true" + font="SansSerifSmall" + h_pad="2" + max_length="65000" + parse_urls="true" + word_wrap="true" + /> + </layout_panel> + <layout_panel + name="about_buttons_panel" + follows="all" + layout="topleft" + height="34" + auto_resize="false" + user_resize="false"> + <button + name="save_description_changes" + label="Save" + top="1" + right="-105" + height="20" + width="80" + enabled="false" + follows="top|right" + layout="topleft"/> + <button + name="discard_description_changes" + label="Discard" + top="1" + right="-1" + height="20" + width="100" + enabled="false" + follows="top|right" + layout="topleft"/> + <view_border + bevel_style="none" + height="0" + layout="topleft" + left="0" + name="cost_text_border" + top_pad="9" + width="492"/> + </layout_panel> + + <layout_panel + name="groups_panel" + follows="all" + layout="topleft" + height="159" + auto_resize="true" + user_resize="false"> + <text + name="group_label" + value="Group memberships" + top="1" + left="2" + right="-1" + height="16" + follows="left|top|right" + layout="topleft"/> + <group_list + name="group_list" + top="18" + left="2" + right="-1" + bottom="-1" + follows="all" + layout="topleft" + border_visible="true" + color="ScrollBgWriteableColor" + for_agent="false"/> + + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_web.xml b/indra/newview/skins/default/xui/en/panel_profile_web.xml new file mode 100644 index 0000000000..e0cb4d3d06 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_web.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + name="panel_profile_web" + label="Web" + top="0" + left="0" + height="480" + width="420" + follows="all" + layout="topleft" +> + <panel.string + name="LoadTime" + value="Load Time: [TIME] seconds" + /> + <web_browser + name="profile_html" + top="10" + bottom="-18" + left="10" + right="-10" + follows="all" + layout="topleft" + start_url="" + /> + <text + name="status_text" + bottom="-4" + left="110" + right="-110" + follows="bottom|left|right" + layout="topleft" + halign="center" + parse_urls="false" + /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml index 8243c2715d..2aaea04a6d 100644 --- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml @@ -86,7 +86,7 @@ name="detail_texture_text" top="110" width="300"> - Terrain Textures (requires 512x512, 24 bit .tga files) + Terrain Textures (requires 1024x1024, 24 bit .tga files) </text> <texture_picker follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index 90f32ae452..c7052bb737 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -11,6 +11,36 @@ name="Texture" top="0" width="295"> + <panel.string + name="paste_error_face_selection_mismatch"> + When multiple faces are copied, the target object must have the same number of faces selected. + </panel.string> + <panel.string + name="paste_error_object_face_count_mismatch"> + When all faces of an object are copied, the target object must have the same number of faces. + </panel.string> + <panel.string + name="paste_error_inventory_not_found"> + One or more texture not found in inventory. + </panel.string> + <panel.string + name="paste_options"> + Paste options + </panel.string> + + <menu_button + menu_filename="menu_copy_paste_color.xml" + follows="top|left" + height="15" + image_disabled="ClipboardMenu_Disabled" + image_selected="ClipboardMenu_Press" + image_unselected="ClipboardMenu_Off" + layout="topleft" + left="258" + top="8" + name="clipboard_color_params_btn" + tool_tip="Paste options" + width="22"/> <text type="string" length="1" @@ -36,7 +66,7 @@ name="colorswatch" tool_tip="Click to open color picker" top="20" - width="64" /> + width="54" /> <text type="string" length="1" @@ -84,7 +114,7 @@ left_delta="0" name="glow" top_pad="4" - width="80" /> + width="77" /> <check_box height="19" label="Full Bright" @@ -93,13 +123,22 @@ name="checkbox fullbright" top_pad="4" width="81" /> + <view_border + bevel_style="none" + follows="top|left" + height="0" + layout="topleft" + left="8" + name="object_horizontal" + top_pad="4" + width="278" /> <combo_box height="23" layout="topleft" left="10" name="combobox matmedia" - top_pad="5" - width="100"> + top_pad="17" + width="90"> <combo_box.item label="Materials" name="Materials" @@ -113,7 +152,7 @@ control_name="ComboMaterialType" height="50" layout="topleft" - left_pad="20" + left_pad="5" top_delta="-10" width="150" visible = "false" @@ -139,7 +178,20 @@ layout="topleft" top_pad="1" value="2"/> - </radio_group> + </radio_group> + <menu_button + menu_filename="menu_copy_paste_texture.xml" + follows="top|left" + height="15" + image_disabled="ClipboardMenu_Disabled" + image_selected="ClipboardMenu_Press" + image_unselected="ClipboardMenu_Off" + layout="topleft" + left="258" + top_delta="0" + name="clipboard_texture_params_btn" + tool_tip="Paste options" + width="22"/> <check_box control_name="SyncMaterialSettings" follows="top|left" @@ -150,7 +202,7 @@ left="8" name="checkbox_sync_settings" tool_tip="Adjust all maps repeats simultaneously" - top_pad="-16" + top_pad="19" width="160" /> <texture_picker can_apply_immediately="true" @@ -498,10 +550,7 @@ top_pad="4" tool_tip="Add Media" label="Choose..." - width="85"> - <button.commit_callback - function="BuildTool.AddMedia"/> - </button> + width="85"/> <button follows="top|left" height="18" @@ -511,10 +560,7 @@ tool_tip="Delete this media texture" top_delta="0" label="Remove" - width="85"> - <button.commit_callback - function="BuildTool.DeleteMedia"/> - </button> + width="85"/> <button follows="left|top" height="18" @@ -771,14 +817,14 @@ top_delta="16" width="260" /> <button - left="10" - top="222" + follows="left|top" + layout="topleft" + left="9" + top="204" height="20" label="Align" label_selected="Align current texture layers" - layout="topleft" name="button align textures" - top_delta="0" tool_tip="Align current texture layers" width="66" /> <web_browser diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index 8a3e18707f..1c9d750aa6 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -459,7 +459,7 @@ label="Price: L$" label_width="73" width="150" - min_val="1" + min_val="0" height="20" max_val="999999999" tool_tip="Object cost." /> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 8382e3970c..6f95e282ca 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -348,8 +348,6 @@ can be attached to notecards. <!-- Group name: text shown for LLUUID::null --> <string name="GroupNameNone">(none)</string> - <string name="AvalineCaller">Avaline Caller [ORDER]</string> - <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. --> <string name="AssetErrorNone">No error</string> <string name="AssetErrorRequestFailed">Asset request: failed</string> @@ -2342,6 +2340,14 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. An error occurred while opening Marketplace Listings. If you continue to receive this message, please contact Second Life support for assistance at http://support.secondlife.com </string> + <string name="InventoryMarketplaceConnectionError"> +Marketplace Listings failed to connect. +If you continue to receive this message, please contact Second Life support for assistance at http://support.secondlife.com + </string> + <string name="InventoryMarketplaceConnectionErrorReason"> +Marketplace Listings failed to connect. Reason: [REASON] +If you continue to receive this message, please contact Second Life support for assistance at http://support.secondlife.com + </string> <string name="InventoryMarketplaceListingsNoItemsTitle">Your Marketplace Listings folder is empty.</string> <string name="InventoryMarketplaceListingsNoItemsTooltip"></string> <string name="InventoryMarketplaceListingsNoItems"> @@ -2808,10 +2814,14 @@ If you continue to receive this message, please contact Second Life support for <string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string> <string name="ClassifiedUpdateAfterPublish">(will update after publish)</string> - <!-- panel picks --> - <string name="NoPicksClassifiedsText">You haven't created any Picks or Classifieds. Click the Plus button below to create a Pick or Classified.</string> - <string name="NoAvatarPicksClassifiedsText">User has no picks or classifieds</string> - <string name="PicksClassifiedsLoadingText">Loading...</string> + <!-- panel picks --> + <string name="NoPicksClassifiedsText">You haven't created any Picks or Classifieds. Click the Plus button below to create a Pick or Classified.</string> + <string name="NoPicksText">You haven't created any Picks. Click the New button to create a Pick.</string> + <string name="NoClassifiedsText">You haven't created any Classifieds. Click the New button to create a Classified.</string> + <string name="NoAvatarPicksClassifiedsText">User has no picks or classifieds</string> + <string name="NoAvatarPicksText">This person has no picks</string> + <string name="NoAvatarClassifiedsText">This person has no classifieds</string> + <string name="PicksClassifiedsLoadingText">Loading...</string> <!-- Multi Preview Floater --> <string name="MultiPreviewTitle">Preview</string> |