diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
19 files changed, 2354 insertions, 137 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_picks.xml b/indra/newview/skins/default/xui/en/floater_picks.xml deleted file mode 100644 index 984894b016..0000000000 --- a/indra/newview/skins/default/xui/en/floater_picks.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<floater - positioning="cascading" - can_close="true" - can_resize="true" - height="572" - help_topic="sidebar_me" - min_width="333" - min_height="440" - name="floater_picks" - save_rect="true" - save_visibility="true" - reuse_instance="true" - title="Picks" - width="333" > - <panel - class="panel_me" - name="main_panel" - filename="panel_me.xml" - follows="all"/> -</floater> 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..1b56f65cc0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_profile.xml @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater + name="avatarinfo" + height="510" + width="450" + layout="topleft" + can_close="true" + can_resize="true" + help_topic="panel_my_profile_tab" + min_height="510" + min_width="450" + positioning="centered" + save_rect="true" + title="Profile" +> + <panel + name="panel_profile_view" + top="0" + left="0" + height="500" + width="445" + follows="all" + class="panel_profile" + > + <tab_container + name="panel_profile_tabs" + top_pad="5" + left="0" + height="500" + width="445" + follows="all" + layout="topleft" + halign="center" + tab_min_width="55" + tab_position="top" + > + <panel + name="panel_profile_secondlife" + label="Second Life" + 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_interests" + label="Interests" + layout="topleft" + class="panel_profile_interests" + filename="panel_profile_interests.xml" + help_topic="profile_interests_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="Classified" + 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="Notes" + layout="topleft" + class="panel_profile_notes" + filename="panel_profile_notes.xml" + help_topic="profile_notes_tab" + /> + </tab_container> + <button + name="ok_btn" + label="OK" + tool_tip="Save changes to profile and close" + bottom_delta="0" + left="10" + height="20" + width="90" + follows="left|bottom" + layout="topleft" + visible="false" + /> + <button + name="cancel_btn" + label="Cancel" + tool_tip="Discard unsaved changes and close" + bottom_delta="0" + right="-10" + height="20" + width="90" + follows="right|bottom" + layout="topleft" + label_selected="Cancel" + visible="false" + /> + </panel> +</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_name_field.xml b/indra/newview/skins/default/xui/en/menu_name_field.xml new file mode 100644 index 0000000000..3c5e5dd353 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_name_field.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + name="CopyMenu"> + <menu_item_call + label="Copy Display Name" + layout="topleft" + name="copy_display"> + <on_click function="Profile.CopyName" parameter="display"/> + </menu_item_call> + <menu_item_call + label="Copy Agent Name" + layout="topleft" + name="copy_name"> + <on_click function="Profile.CopyName" parameter="name"/> + </menu_item_call> + <menu_item_call + label="Copy Agent Id" + layout="topleft" + name="copy_id"> + <on_click function="Profile.CopyName" parameter="id"/> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 873b95926b..262b76baf3 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -65,8 +65,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..." diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index e846edf1d4..8b52b01bc5 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -336,7 +336,7 @@ height="23" layout="bottomleft" left_pad="3" - name="show_on_map_btn_lp" + name="cancel_btn_lp" auto_resize="true" width="157"> <button 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..fb46d1cce3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml @@ -0,0 +1,83 @@ +<?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="info_btn" + tool_tip="More info" + top_delta="-2" + left_pad="3" + right="-31" + 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_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml new file mode 100644 index 0000000000..60b13c0bc2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml @@ -0,0 +1,739 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + name="panel_profile_classified" + top="0" + left="0" + height="420" + width="325" + 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> + <scroll_container + name="profile_scroll" + top="0" + left="0" + bottom="-35" + width="320" + 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="290" + follows="left|top" + layout="topleft" + background_visible="false" + min_height="200" + > + <texture_picker + name="classified_snapshot" + enabled="false" + top="0" + left="10" + height="197" + width="275" + follows="left|top|right" + 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="197" + width="272" + layout="topleft" + follows="left|top|right" + image_name="spacer24.tga" + visible="false" + /> + <layout_stack + name="info_panel" + top="180" + left="0" + height="375" + width="320" + follows="all" + layout="topleft" + visible="true" + animate="false" + orientation="vertical" + > + <layout_panel + name="main_info_panel" + top="0" + left="0" + height="160" + width="290" + follows="all" + layout="topleft" + auto_resize="false" + > + <text_editor + name="classified_name" + top="0" + left="10" + height="35" + width="280" + 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="290" + 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="180" + 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_stack + name="edit_btns_pnl" + bottom="-1" + left="9" + height="25" + follows="left|right|bottom" + layout="topleft" + orientation="horizontal" + animate="false" + > + <layout_panel + follows="all" + height="25" + layout="topleft" + left="0" + name="teleport_btn_lp" + auto_resize="true" + top="0" + width="101"> + <button + name="teleport_btn" + label="Teleport" + top="0" + left="0" + height="23" + width="101" + 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="true" + width="100"> + <button + name="show_on_map_btn" + label="Map" + top="0" + left="0" + height="23" + width="100" + 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="true" + width="101"> + <button + name="edit_btn" + label="Edit" + top="0" + left="0" + height="23" + width="101" + follows="bottom|left|right" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + height="25" + layout="topleft" + left="0" + name="save_btn_lp" + auto_resize="true" + top="0" + width="155"> + <button + name="save_changes_btn" + label="[LABEL]" + top="0" + left="0" + left_pad="5" + height="23" + width="155" + follows="bottom|left|right" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + height="25" + layout="bottomleft" + left_pad="2" + name="cancel_btn_lp" + auto_resize="true" + width="156"> + <button + name="cancel_btn" + label="Cancel" + top="0" + left="0" + height="23" + width="156" + follows="bottom|left|right" + layout="topleft" + /> + </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..ff27113d53 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml @@ -0,0 +1,78 @@ +<?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" + /> + <loading_indicator + name="progress_indicator" + top="20" + right="-10" + height="23" + width="23" + follows="top|right" + layout="topleft" + visible="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" + /> + <tab_container + name="tab_classifieds" + top="50" + bottom="-21" + left="4" + right="-4" + follows="all" + layout="topleft" + halign="left" + tab_position="left" + tab_width="85" + use_ellipses="true" + /> + <text + name="classifieds_panel_text" + top="300" + left="110" + right="-110" + height="25" + follows="left|top|right" + layout="topleft" + halign="center" + mouse_opaque="false" + wrap="true" + > + Loading... + </text> +</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..7bda6d1718 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml @@ -0,0 +1,51 @@ +<?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" + /> + <texture_picker + name="real_world_pic" + enabled="false" + top="10" + left="6" + height="225" + width="202" + follows="top|left" + layout="topleft" + allow_no_texture="true" + default_image_name="None" + fallback_image="Generic_Person_Large" + /> + <text_editor + name="fl_description_edit" + trusted_content="false" + enabled="false" + top="225" + left="6" + right="-7" + height="183" + follows="all" + layout="topleft" + bg_readonly_color="Transparent" + border_visible="true" + max_length="253" + parse_urls="true" + word_wrap="true" + /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_interests.xml b/indra/newview/skins/default/xui/en/panel_profile_interests.xml new file mode 100644 index 0000000000..0359b0bc4b --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_interests.xml @@ -0,0 +1,250 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + name="panel_profile_interests" + label="Interests" + 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" + /> + <text + name="I Want To:" + top="10" + left="4" + height="16" + width="70" + follows="left|top" + layout="topleft" + halign="right" + > + I Want To: + </text> + <check_box + name="chk0" + label="Build" + enabled="false" + top_delta="0" + left="75" + height="16" + width="90" + follows="left|top" + layout="topleft" + /> + <check_box + name="chk1" + label="Explore" + enabled="false" + left_pad="80" + height="16" + width="90" + follows="left|top" + layout="topleft" + /> + <check_box + name="chk2" + label="Meet" + enabled="false" + top_pad="5" + left="75" + height="16" + width="90" + follows="left|top" + layout="topleft" + /> + <check_box + name="chk6" + label="Be Hired" + enabled="false" + left_pad="80" + height="16" + width="90" + follows="left|top" + layout="topleft" + /> + <check_box + name="chk3" + label="Group" + enabled="false" + top_pad="5" + left="75" + height="16" + width="90" + follows="left|top" + layout="topleft" + /> + <check_box + name="chk4" + label="Buy" + enabled="false" + left_pad="80" + height="16" + width="90" + follows="left|top" + layout="topleft" + /> + <check_box + name="chk5" + label="Sell" + enabled="false" + top_pad="5" + left="75" + height="16" + width="90" + follows="left|top" + layout="topleft" + /> + <check_box + name="chk7" + label="Hire" + enabled="false" + left_pad="80" + height="16" + width="90" + follows="left|top" + layout="topleft" + /> + <line_editor + name="want_to_edit" + enabled="false" + top_pad="10" + left="76" + height="18" + width="330" + follows="left|top|right" + layout="topleft" + text_pad_left="4" + max_length_bytes="254" + > + (loading...) + </line_editor> + + <text + name="Skills:" + top_pad="20" + left="4" + height="16" + width="70" + follows="left|top" + layout="topleft" + halign="right" + > + Skills: + </text> + <check_box + name="schk0" + label="Textures" + enabled="false" + top_delta="0" + left="75" + height="16" + width="90" + follows="left|top" + layout="topleft" + /> + <check_box + name="schk1" + label="Architecture" + enabled="false" + left_pad="80" + height="16" + width="90" + follows="left|top" + layout="topleft" + /> + <!-- The next two are out of order on purpose due to legacy ordering --> + <check_box + name="schk3" + label="Modeling" + enabled="false" + top_pad="5" + left="75" + height="16" + width="90" + follows="left|top" + layout="topleft" + /> + <check_box + name="schk2" + label="Event Planning" + enabled="false" + left_pad="80" + height="16" + width="90" + follows="left|top" + layout="topleft" + /> + <check_box + name="schk4" + label="Scripting" + enabled="false" + top_pad="5" + left="75" + height="16" + width="90" + follows="left|top" + layout="topleft" + /> + <check_box + name="schk5" + label="Custom Characters" + enabled="false" + left_pad="80" + height="16" + width="90" + follows="left|top" + layout="topleft" + /> + <line_editor + name="skills_edit" + enabled="false" + top_pad="10" + left="76" + height="18" + width="330" + follows="left|top|right" + layout="topleft" + text_pad_left="4" + max_length_bytes="254" + > + (loading...) + </line_editor> + + <text + name="Languages:" + top_pad="20" + left="4" + height="16" + width="70" + follows="left|top" + layout="topleft" + halign="right" + > + Languages: + </text> + <line_editor + name="languages_edit" + enabled="false" + top_delta="-1" + left="76" + height="18" + width="330" + follows="left|top|right" + layout="topleft" + text_pad_left="4" + max_length_bytes="254" + > + (loading...) + </line_editor> +</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..0bafaac361 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_notes.xml @@ -0,0 +1,86 @@ +<?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="Private notes on this avatar:" + 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_pad="4" + left="6" + right="-6" + height="335" + follows="all" + layout="topleft" + max_length="1000" + word_wrap="true" + /> + <text + name="status_message2" + value="Allow this avatar to:" + top_pad="8" + left="6" + right="-6" + height="16" + follows="left|bottom|right" + layout="topleft" + font.style="BOLD" + /> + <check_box + name="status_check" + label="See when I am online" + enabled="false" + left="10" + height="16" + width="293" + follows="left|bottom|right" + layout="topleft" + /> + <check_box + name="map_check" + label="Find me on the world map" + enabled="false" + left="10" + height="16" + width="293" + follows="left|bottom|right" + layout="topleft" + /> + <check_box + name="objects_check" + label="Edit, delete or take my objects" + enabled="false" + left="10" + height="16" + width="293" + follows="left|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..0417df43c9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml @@ -0,0 +1,111 @@ +<?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> + <texture_picker + name="pick_snapshot" + top="10" + left="10" + height="180" + width="290" + follows="left|top" + layout="topleft" + fallback_image="default_land_picture.j2c" + /> + <line_editor + name="pick_name" + enabled="false" + top_pad="-15" + left="10" + height="20" + width="290" + follows="left|right|top" + layout="topleft" + /> + <text_editor + name="pick_desc" + trusted_content="false" + always_show_icons="true" + enabled="false" + top_pad="8" + left="10" + height="70" + width="290" + follows="all" + layout="topleft" + allow_html="true" + border_visible="true" + h_pad="4" + max_length="1023" + v_pad="3" + word_wrap="true" + /> + <line_editor + name="pick_location" + enabled="false" + left="10" + height="20" + width="290" + follows="left|right|bottom" + layout="topleft" + length="1" + type="string" + > + Loading... + </line_editor> + <button + name="teleport_btn" + label="Teleport" + bottom="-40" + left="10" + height="20" + width="80" + follows="left|bottom" + layout="topleft" + /> + <button + name="show_on_map_btn" + label="Show on Map" + bottom_delta="0" + left_pad="5" + height="20" + width="100" + follows="left|bottom" + layout="topleft" + /> + <button + name="set_to_curr_location_btn" + label="Set Location" + tool_tip="Set to Current Location" + bottom_delta="0" + left_pad="5" + height="20" + width="100" + follows="left|bottom" + layout="topleft" + visible="false" + /> + <button + name="save_changes_btn" + label="Save Pick" + bottom="-15" + left="10" + height="20" + width="100" + follows="left|bottom" + layout="topleft" + visible="false" + /> +</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..56a48572d3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_picks.xml @@ -0,0 +1,89 @@ +<?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" + /> + <loading_indicator + name="progress_indicator" + top="20" + right="-10" + height="23" + width="23" + follows="top|right" + layout="topleft" + visible="false" + /> + <text + name="Tell everyone about your favorite places in Second Life." + 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" + /> + <tab_container + name="tab_picks" + top="50" + bottom="-5" + left="4" + right="-4" + follows="all" + layout="topleft" + halign="left" + tab_position="left" + use_ellipses="true" + /> + <text + name="picks_panel_text" + top="300" + left="110" + right="-110" + height="25" + follows="left|top|right" + layout="topleft" + halign="center" + mouse_opaque="false" + wrap="true" + > + Loading... + </text> +</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..1b038196ef --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml @@ -0,0 +1,560 @@ +<?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="status_online" + > + Currently Online + </string> + <string + name="status_offline" + > + Currently Offline + </string> + <string + name="CaptionTextAcctInfo" + > + [ACCTTYPE] +[PAYMENTINFO] + </string> + <string + name="payment_update_link_url" + > + http://www.secondlife.com/account/billing.php?lang=en + </string> + <string + name="partner_edit_link_url" + > + http://www.secondlife.com/account/partners.php?lang=en + </string> + <string + name="my_account_link_url" + value="http://secondlife.com/account" + /> + <string + name="no_partner_text" + value="None" + /> + <string + name="no_group_text" + value="None" + /> + <string + name="RegisterDateFormat" + > + [REG_DATE] + </string> + <string + name="name_text_args" + > + [NAME] + </string> + <string + name="display_name_text_args" + > + [DISPLAY_NAME] + </string> + <string + name="FSDev" + value=" Developer" + /> + <string + name="FSSupp" + value=" Support" + /> + <string + name="FSQualityAssurance" + value=" Bug Hunter" + /> + <string + name="FSGW" + value=" Gateway" + /> + <loading_indicator + name="progress_indicator" + top="4" + right="-10" + height="23" + width="23" + follows="top|right" + layout="topleft" + visible="false" + /> + <text + name="name_label" + value="Name:" + top="8" + left="6" + height="20" + width="55" + follows="left|top" + layout="topleft" + halign="right" + /> + <button + name="set_name" + label="Name:" + tool_tip="Set Display Name" + enabled="false" + top_delta="0" + left_delta="0" + height="20" + width="55" + follows="top|left" + layout="topleft" + visible="false" + /> + <panel + name="name_holder" + top_delta="0" + left_pad="4" + right="-5" + height="20" + follows="left|top|right" + layout="topleft" + allow_scroll="false" + bg_visible="false" + border_visible="false"> + <text_editor + name="complete_name" + value="(loading...)" + enabled="false" + top="0" + left="0" + right="-1" + height="20" + follows="left|top|right" + layout="topleft" + allow_scroll="false" + bg_visible="false" + border_visible="true" + h_pad="1" + v_pad="4" + max_length="254" + /> + <!--mouse_opaque="true"--> + <menu_button + name="copy_btn" + tool_tip="Copy options" + height="16" + right="-2" + top="2" + width="16" + image_selected="Copy" + image_unselected="Copy" + image_hover_selected="CopyBright" + image_hover_unselected="CopyBright" + hover_glow_amount="0.33" + chrome="true" + tab_stop="false" + follows="top|right" + layout="topleft" /> + </panel> + <layout_stack + name="imagepositioner" + top_pad="6" + left_delta="0" + right="-1" + height="158" + follows="top|left|right" + layout="topleft" + orientation="horizontal" + > + <layout_panel + name="image_stack" + follows="all" + layout="topleft" + width="158" + height="158" + auto_resize="false" + user_resize="false" + > + <!-- 23 pixels (BTN_HEIGHT_SMALL) are reserved by label field of texture and shouldn't be visible--> + <texture_picker + name="2nd_life_pic" + top="0" + left="0" + right="-1" + height="180" + follows="all" + layout="topleft" + allow_no_texture="true" + default_image_name="None" + fallback_image="Generic_Person_Large" + /> + </layout_panel> + <layout_panel + name="label_stack" + follows="all" + layout="topleft" + auto_resize="true" + user_resize="false" + > + <text + name="status" + value="Status Unknown" + top="1" + left="4" + right="-6" + height="16" + follows="top|left" + layout="topleft" + halign="center" + text_color="LtGray_50" + /> + <text + name="label" + value="Second Life Birthdate:" + top_pad="2" + right="-6" + height="16" + follows="top|left" + layout="topleft" + /> + <text_editor + name="register_date" + value="(loading...)" + top_pad="0" + left_delta="2" + right="-6" + height="16" + follows="top|left|right" + layout="topleft" + allow_scroll="false" + bg_visible="false" + border_visible="true" + h_pad="2" + max_length="254" + read_only="true" + translate="false" + v_pad="2" + word_wrap="true" + /> + <text + name="label2" + value="Account:" + top_pad="5" + left_delta="-2" + right="-6" + height="16" + follows="top|left" + layout="topleft" + /> + <text_editor + name="acc_status_text" + top_pad="0" + left_delta="2" + right="-6" + height="44" + follows="top|left|right" + layout="topleft" + allow_scroll="false" + bg_visible="false" + border_visible="true" + h_pad="2" + read_only="true" + translate="false" + v_pad="2" + word_wrap="true" + /> + <text + name="partner_label" + value="Partner:" + top_pad="5" + left_delta="-2" + right="-6" + height="16" + follows="top|left" + layout="topleft" + /> + <text_editor + name="partner_text" + top_pad="0" + left_delta="0" + right="-6" + height="20" + follows="top|left|right" + layout="topleft" + allow_scroll="false" + bg_visible="false" + border_visible="true" + parse_urls="true" + h_pad="1" + read_only="true" + translate="false" + v_pad="4" + max_length="254" + /> + </layout_panel> + </layout_stack> + <text + name="Groups:" + value="Groups:" + top_pad="7" + left="6" + height="16" + width="55" + follows="left|top" + layout="topleft" + halign="right" + /> + <button + name="group_invite" + label="+" + tool_tip="Invite to Group" + top_delta="20" + left="40" + height="20" + width="20" + follows="left|top" + layout="topleft" + label_selected="+" + /> + <group_list + name="group_list" + top_delta="-20" + left="66" + right="-7" + height="82" + follows="left|top|right" + layout="topleft" + border_visible="true" + color="ScrollBgWriteableColor" + for_agent="false" + /> + + <layout_stack + name="aboutpositioner" + top_pad="7" + left="6" + right="-6" + height="130" + follows="all" + layout="topleft" + orientation="vertical" + > + <layout_panel + name="about_stack" + follows="all" + layout="topleft" + left="0" + height="105" + auto_resize="true" + user_resize="false"> + <text + name="About:" + value="About:" + top="1" + left="0" + height="16" + width="55" + follows="left|top" + layout="topleft" + halign="right" + /> + <text_editor + name="sl_description_edit" + trusted_content="false" + always_show_icons="true" + enabled="false" + top="0" + left="60" + right="-1" + bottom="-1" + follows="all" + layout="topleft" + bg_readonly_color="Transparent" + border_visible="true" + font="SansSerifSmall" + h_pad="2" + max_length="510" + parse_urls="true" + word_wrap="true" + /> + </layout_panel> + <layout_panel + name="give_stack" + follows="left|bottom" + layout="topleft" + left="0" + height="24" + auto_resize="false" + user_resize="false"> + <text + name="Give item:" + value="Give item:" + top="6" + left="0" + height="16" + width="55" + follows="left|bottom" + layout="topleft" + halign="right" + /> + <view_border + name="drop_target_rect_vis" + top_delta="0" + left="60" + right="-1" + height="16" + follows="left|bottom|right" + layout="topleft" + bevel_style="in" + /> + <text + name="Give inventory" + tool_tip="Drop inventory items here to give them to this person." + top_delta="0" + left="60" + right="-1" + height="16" + follows="left|bottom|right" + layout="topleft" + halign="center" + > + Drop inventory item here. + </text> + </layout_panel> + </layout_stack> + <layout_stack + name="buttonstack" + bottom="-3" + left="6" + right="-6" + height="44" + follows="left|bottom|right" + layout="topleft" + orientation="horizontal" + > + <layout_panel + name="left_buttonstack" + left="2" + right="-2" + height="42" + follows="all" + layout="topleft" + user_resize="false" + > + <button + name="show_on_map_btn" + label="Find on Map" + tool_tip="Locate the Resident on the map" + top="2" + left="2" + height="20" + follows="left|top|right" + layout="topleft" + label_selected="Find on Map" + /> + <button + name="pay" + label="Pay" + tool_tip="Pay money to the Resident" + top_pad="2" + height="20" + follows="left|top|right" + layout="topleft" + label_selected="Pay" + /> + </layout_panel> + <layout_panel + name="middle_buttonstack" + left="2" + right="-2" + follows="all" + layout="topleft" + user_resize="false" + > + <button + name="teleport" + label="Offer Teleport" + tool_tip="Offer a teleport to the Resident" + top="2" + left="2" + height="20" + follows="left|top|right" + layout="topleft" + label_selected="Offer Teleport" + /> + <button + name="im" + label="Instant Message" + tool_tip="Open instant message session" + top_pad="2" + height="20" + follows="left|top|right" + layout="topleft" + label_selected="Instant Message" + /> + </layout_panel> + <layout_panel + name="right_buttonstack" + left="2" + right="-2" + follows="all" + layout="topleft" + user_resize="false" + > + <button + name="add_friend" + label="Add Friend" + tool_tip="Offer friendship to the Resident" + top="2" + left="2" + height="20" + follows="left|top|right" + layout="topleft" + label_selected="Add Friend" + /> + <button + name="block" + label="Block" + tool_tip="Block this Resident" + top_pad="2" + height="20" + follows="left|top|right" + layout="topleft" + /> + <button + name="unblock" + label="Unblock" + tool_tip="Unblock this Resident" + top_delta="0" + height="20" + follows="left|top|right" + layout="topleft" + /> + </layout_panel> + </layout_stack> + <check_box + name="show_in_search_checkbox" + label="Show in search" + tool_tip="Let people see you in search results" + enabled="false" + bottom="-30" + left="60" + height="16" + width="130" + follows="left|bottom" + layout="topleft" + visible="false" + /> + <profile_drop_target + name="drop_target" + top="0" + bottom="-1" + left="0" + right="-1" + follows="all" + layout="topleft" + mouse_opaque="false" + /> +</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..af2ac57f58 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_profile_web.xml @@ -0,0 +1,35 @@ +<?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" + /> +</panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 1bfac6aeb7..aa68819e53 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2797,10 +2797,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">User has no picks</string> + <string name="NoAvatarClassifiedsText">User has no classifieds</string> + <string name="PicksClassifiedsLoadingText">Loading...</string> <!-- Multi Preview Floater --> <string name="MultiPreviewTitle">Preview</string> |