From b82d70cf2aa2b56a2c0bfdd941ee4f74e690e4df Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Mon, 4 Mar 2019 00:18:45 -0800
Subject: Added viewer based profiles Split picks and classifieds in to
 separate panels Moved getProfileURL to LLAvatarActions Removed dead XUI
 panels Removed picks/classifieds floater

---
 .../newview/skins/default/xui/en/floater_picks.xml |  21 -
 .../skins/default/xui/en/floater_profile.xml       | 119 ++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |   3 +-
 .../default/xui/en/panel_group_list_item_short.xml |  83 +++
 indra/newview/skins/default/xui/en/panel_me.xml    |  19 -
 .../default/xui/en/panel_profile_classified.xml    | 711 +++++++++++++++++++++
 .../default/xui/en/panel_profile_classifieds.xml   |  76 +++
 .../default/xui/en/panel_profile_firstlife.xml     |  59 ++
 .../default/xui/en/panel_profile_interests.xml     | 250 ++++++++
 .../skins/default/xui/en/panel_profile_notes.xml   |  86 +++
 .../skins/default/xui/en/panel_profile_pick.xml    | 109 ++++
 .../skins/default/xui/en/panel_profile_picks.xml   |  87 +++
 .../default/xui/en/panel_profile_secondlife.xml    | 512 +++++++++++++++
 .../skins/default/xui/en/panel_profile_web.xml     |  92 +++
 indra/newview/skins/default/xui/en/strings.xml     |  12 +-
 15 files changed, 2193 insertions(+), 46 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_picks.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_profile.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_me.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_profile_classified.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_profile_interests.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_profile_notes.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_profile_pick.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_profile_picks.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_profile_web.xml

(limited to 'indra/newview/skins/default/xui/en')

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_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml
new file mode 100644
index 0000000000..af70ba66f0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_profile.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ name="avatarinfo"
+ height="510"
+ width="430"
+ layout="topleft"
+ can_close="true"
+ can_resize="true"
+ help_topic="panel_my_profile_tab"
+ min_height="510"
+ min_width="430"
+ positioning="centered"
+ save_rect="true"
+ title="Profile"
+>
+    <panel
+     name="panel_profile_view"
+     top="0"
+     left="0"
+     height="500"
+     width="420"
+     follows="all"
+     class="panel_profile"
+    >
+        <tab_container
+         name="panel_profile_tabs"
+         top_pad="5"
+         left="0"
+         height="500"
+         width="420"
+         follows="all"
+         layout="topleft"
+         halign="center"
+         tab_min_width="55"
+         tab_position="top"
+        >
+            <panel
+             name="panel_profile_secondlife"
+             label="2nd Life"
+             layout="topleft"
+             class="panel_profile_secondlife"
+             filename="panel_profile_secondlife.xml"
+             help_topic="profile_secondlife_tab"
+            />
+            <panel
+             name="panel_profile_web"
+             label="Web"
+             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="1st 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"
+         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/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 42744b561f..c0ec3c37b7 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -63,8 +63,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_group_list_item_short.xml b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
new file mode 100644
index 0000000000..d08fdc8c7f
--- /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="0"
+     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..291a67ffba
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -0,0 +1,711 @@
+<?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="350"
+>
+    <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="-45"
+     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="570"
+         width="290"
+         follows="left|top"
+         layout="topleft"
+         background_visible="false"
+         min_height="300"
+        >
+            <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"
+             image_name="spacer24.tga"
+             visible="false"
+            />
+            <panel
+             name="info_panel"
+             top="180"
+             left="0"
+             height="520"
+             width="320"
+             follows="all"
+             layout="topleft"
+             visible="true"
+            >
+                <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_stack
+                 name="descr_stack"
+                 top_pad="5"
+                 left="10"
+                 height="215"
+                 width="290"
+                 follows="all"
+                 layout="topleft"
+                 animate="false"
+                 orientation="vertical"
+                >
+                    <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="0"
+                         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="0"
+                         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"
+                    >
+                        <text
+                         name="classified_desc_label"
+                         value="Description:"
+                         top="0"
+                         left="0"
+                         height="10"
+                         width="250"
+                         follows="left|top"
+                         layout="topleft"
+                         font.style="BOLD"
+                         text_color="white"
+                        />
+                        <text_editor
+                         name="classified_desc"
+                         value="[description]"
+                         top_pad="7"
+                         left="0"
+                         height="200"
+                         width="280"
+                         follows="all"
+                         layout="topleft"
+                         allow_scroll="true"
+                         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>
+            <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"
+                 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"
+                />
+                <text
+                 name="price_for_listing_edit_label"
+                 value="Price for listing:"
+                 top_pad="10"
+                 left="10"
+                 height="10"
+                 width="120"
+                 follows="left|top"
+                 layout="topleft"
+                 text_color="white"
+                />
+                <spinner
+                 name="price_for_listing_edit"
+                 label="L$"
+                 value="50"
+                 tool_tip="Price for listing."
+                 top_delta="0"
+                 left_pad="0"
+                 height="23"
+                 width="105"
+                 follows="left|top"
+                 layout="topleft"
+                 decimal_digits="0"
+                 halign="left"
+                 increment="1"
+                 label_width="20"
+                 max_val="99999"
+                 min_val="50"
+                />
+            </panel>
+        </panel>
+    </scroll_container>
+    <panel
+     name="button_panel"
+     bottom="-1"
+     left="9"
+     height="35"
+     follows="left|right|bottom"
+     layout="topleft"
+    >
+        <button
+         name="teleport_btn"
+         label="Teleport"
+         top="0"
+         left="0"
+         height="23"
+         width="101"
+         follows="bottom|left|right"
+         layout="topleft"
+        />
+        <button
+         name="show_on_map_btn"
+         label="Map"
+         top="0"
+         left_pad="5"
+         height="23"
+         width="100"
+         follows="bottom|left|right"
+         layout="topleft"
+        />
+        <button
+         name="edit_btn"
+         label="Edit"
+         top="0"
+         left_pad="5"
+         height="23"
+         width="101"
+         follows="bottom|left|right"
+         layout="topleft"
+        />
+        <button
+         name="save_changes_btn"
+         label="[LABEL]"
+         top="0"
+         left="0"
+         height="23"
+         width="155"
+         follows="bottom|left|right"
+         layout="topleft"
+         visible="false"
+        />
+        <button
+         name="cancel_btn"
+         label="Cancel"
+         top="0"
+         left_pad="5"
+         height="23"
+         width="156"
+         follows="bottom|left|right"
+         layout="topleft"
+         visible="false"
+        />
+    </panel>
+</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..3c0ff2b10c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
@@ -0,0 +1,76 @@
+<?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..."
+     enabled="false"
+     top="25"
+     left="5"
+     height="20"
+     width="70"
+     follows="left|top"
+     layout="topleft"
+     visible="true"
+    />
+    <button
+     name="delete_btn"
+     label="Delete..."
+     enabled="false"
+     left_pad="5"
+     height="20"
+     width="70"
+     follows="left|top"
+     layout="topleft"
+     visible="true"
+    />
+    <tab_container
+     name="tab_classifieds"
+     top="50"
+     bottom="-5"
+     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..957b5fe05e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -0,0 +1,59 @@
+<?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="275"
+     follows="top|left"
+     layout="topleft"
+     allow_no_texture="true"
+     default_image_name="None"
+     fallback_image="Generic_Person_Large"
+    />
+    <view_border
+     name="info_border"
+     top="225"
+     left="6"
+     right="-6"
+     height="185"
+     follows="all"
+     layout="topleft"
+     bevel_style="in"
+    />
+    <text_editor
+     name="fl_description_edit"
+     enabled="false"
+     top_delta="1"
+     left_delta="1"
+     right="-7"
+     height="183"
+     follows="all"
+     layout="topleft"
+     bg_readonly_color="Transparent"
+     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..5a943ccf4d
--- /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..1be7edbcea
--- /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 &amp; 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..40f3f83320
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
@@ -0,0 +1,109 @@
+<?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|right|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"
+     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..7d0bb16b16
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_profile_picks.xml
@@ -0,0 +1,87 @@
+<?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..."
+     enabled="false"
+     top_pad="4"
+     left="5"
+     height="20"
+     width="70"
+     follows="left|top"
+     layout="topleft"
+     visible="false"
+    />
+    <button
+     name="delete_btn"
+     label="Delete..."
+     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..ae1a91325f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -0,0 +1,512 @@
+<?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"
+    >
+    </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"
+    />
+    <!--
+
+KC: Use view_border's around text_editor's due to text render issues with border_visible
+
+-->
+    <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"
+    />
+    <view_border
+     name="info_border"
+     left_pad="4"
+     right="-6"
+     height="20"
+     follows="left|top|right"
+     layout="topleft"
+     bevel_style="in"
+    />
+    <text_editor
+     name="complete_name"
+     value="(loading...)"
+     enabled="false"
+     top_delta="0"
+     left_delta="3"
+     right="-6"
+     height="20"
+     follows="left|top|right"
+     layout="topleft"
+     allow_scroll="false"
+     bg_visible="false"
+     border_visible="false"
+     h_pad="1"
+     v_pad="2"
+     max_length="254"
+    />
+    <texture_picker
+     name="2nd_life_pic"
+     enabled="false"
+     top_pad="6"
+     left_delta="0"
+     height="180"
+     width="220"
+     follows="top|left"
+     layout="topleft"
+     allow_no_texture="true"
+     default_image_name="None"
+     fallback_image="Generic_Person_Large"
+    />
+    <text
+     name="status"
+     value="Status Unknown"
+     top_delta="1"
+     left_pad="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"
+    />
+    <view_border
+     name="info_border3"
+     top_pad="0"
+     right="-6"
+     height="16"
+     follows="top|left|right"
+     layout="topleft"
+     bevel_style="in"
+    />
+    <text_editor
+     name="register_date"
+     value="(loading...)"
+     top_delta="0"
+     left_delta="2"
+     right="-6"
+     height="16"
+     follows="top|left|right"
+     layout="topleft"
+     allow_scroll="false"
+     bg_visible="false"
+     border_visible="false"
+     h_pad="2"
+     max_length="254"
+     read_only="true"
+     translate="false"
+     v_pad="0"
+     word_wrap="true"
+    />
+    <text
+     name="label2"
+     value="Account:"
+     top_pad="6"
+     left_delta="-2"
+     right="-6"
+     height="16"
+     follows="top|left"
+     layout="topleft"
+    />
+    <view_border
+     name="acct_border"
+     top_pad="0"
+     left_delta="0"
+     right="-6"
+     height="48"
+     follows="top|left|right"
+     layout="topleft"
+     bevel_style="in"
+    />
+    <text_editor
+     name="acc_status_text"
+     top_delta="0"
+     left_delta="2"
+     right="-6"
+     height="44"
+     follows="top|left|right"
+     layout="topleft"
+     allow_scroll="false"
+     bg_visible="false"
+     border_visible="false"
+     h_pad="2"
+     read_only="true"
+     translate="false"
+     v_pad="0"
+     word_wrap="true"
+    />
+    <text
+     name="partner_label"
+     value="Partner:"
+     top_pad="6"
+     left_delta="-2"
+     right="-6"
+     height="16"
+     follows="top|left"
+     layout="topleft"
+    />
+    <view_border
+     name="info_border4"
+     top_pad="0"
+     left_delta="0"
+     right="-6"
+     height="18"
+     follows="top|left|right"
+     layout="topleft"
+     bevel_style="in"
+    />
+    <text
+     name="partner_text"
+     top_delta="2"
+     left_delta="2"
+     right="-6"
+     height="16"
+     follows="top|left|right"
+     layout="topleft"
+     max_length="254"
+    />
+    <text
+     name="Groups:"
+     value="Groups:"
+     top_pad="8"
+     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="-6"
+     height="80"
+     follows="left|top|right"
+     layout="topleft"
+     border_visible="true"
+     color="ScrollBgWriteableColor"
+     for_agent="false"
+    />
+    <text
+     name="About:"
+     value="About:"
+     top_pad="8"
+     left="6"
+     height="16"
+     width="55"
+     follows="left|top"
+     layout="topleft"
+     halign="right"
+    />
+    <view_border
+     name="info_border5"
+     top_delta="0"
+     left="66"
+     right="-6"
+     height="102"
+     follows="all"
+     layout="topleft"
+     bevel_style="in"
+    />
+    <text_editor
+     name="sl_description_edit"
+     enabled="false"
+     top_delta="1"
+     left_delta="1"
+     right="-7"
+     height="100"
+     follows="all"
+     layout="topleft"
+     bg_readonly_color="Transparent"
+     border_visible="false"
+     font="SansSerifSmall"
+     h_pad="2"
+     max_length="510"
+     parse_urls="true"
+     word_wrap="true"
+    />
+    <text
+     name="Give item:"
+     value="Give item:"
+     top_pad="10"
+     left="6"
+     height="16"
+     width="55"
+     follows="left|bottom"
+     layout="topleft"
+     halign="right"
+    />
+    <view_border
+     name="drop_target_rect_vis"
+     top_delta="0"
+     left="66"
+     right="-6"
+     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="66"
+     right="-6"
+     height="16"
+     follows="left|bottom|right"
+     layout="topleft"
+     halign="center"
+    >
+        Drop inventory item here.
+    </text>
+    <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"
+             right="-40"
+             follows="left|top|right"
+             layout="topleft"
+            />
+        </layout_panel>
+    </layout_stack>
+    <check_box
+     name="show_in_search_checkbox"
+     label="Show in search"
+     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..265de3d1b6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_profile_web.xml
@@ -0,0 +1,92 @@
+<?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"
+    />
+    <line_editor
+     name="url_edit"
+     enabled="false"
+     top_pad="5"
+     left="10"
+     height="16"
+     width="400"
+     follows="left|top"
+     layout="topleft"
+     text_pad_left="4"
+     max_length_bytes="254"
+    >
+        (loading..)
+    </line_editor>
+    <flyout_button
+     name="load"
+     label="Load"
+     tool_tip="Load this profile page with embedded web browser."
+     enabled="false"
+     top_pad="5"
+     left="10"
+     height="18"
+     width="80"
+     follows="left|top"
+     layout="topleft"
+    >
+        <flyout_button.item
+         name="open_item"
+         label="Open in-viewer browser"
+         value="popout"
+        />
+        <flyout_button.item
+         name="home_item"
+         label="Open external browser"
+         value="external"
+        />
+    </flyout_button>
+    <loading_indicator
+     name="progress_indicator"
+     left_pad="100"
+     height="23"
+     width="23"
+     follows="top|left"
+     layout="topleft"
+     visible="false"
+    />
+    <button
+     name="web_profile_popout_btn"
+     top_delta="5"
+     right="-10"
+     height="16"
+     width="16"
+     follows="right|top"
+     layout="topleft"
+     image_overlay="tearoffbox.tga"
+     tool_tip="Popout web profile"
+    />
+    <web_browser
+     name="profile_html"
+     top="48"
+     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 f5f4b4acab..2967fb5103 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2773,10 +2773,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>
-- 
cgit v1.2.3


From 36e57208ac70f19d2c7c78874c9f088096e2603c Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Tue, 5 Mar 2019 00:07:19 +0200
Subject: Line endings fix

---
 .../skins/default/xui/en/floater_profile.xml       |  238 ++--
 .../default/xui/en/panel_group_list_item_short.xml |  166 +--
 .../default/xui/en/panel_profile_classified.xml    | 1422 ++++++++++----------
 .../default/xui/en/panel_profile_classifieds.xml   |  152 +--
 .../default/xui/en/panel_profile_firstlife.xml     |  118 +-
 .../default/xui/en/panel_profile_interests.xml     |  500 +++----
 .../skins/default/xui/en/panel_profile_notes.xml   |  172 +--
 .../skins/default/xui/en/panel_profile_pick.xml    |  218 +--
 .../skins/default/xui/en/panel_profile_picks.xml   |  174 +--
 .../default/xui/en/panel_profile_secondlife.xml    | 1024 +++++++-------
 .../skins/default/xui/en/panel_profile_web.xml     |  184 +--
 11 files changed, 2184 insertions(+), 2184 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml
index af70ba66f0..e1f4f0b010 100644
--- a/indra/newview/skins/default/xui/en/floater_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile.xml
@@ -1,119 +1,119 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<floater
- name="avatarinfo"
- height="510"
- width="430"
- layout="topleft"
- can_close="true"
- can_resize="true"
- help_topic="panel_my_profile_tab"
- min_height="510"
- min_width="430"
- positioning="centered"
- save_rect="true"
- title="Profile"
->
-    <panel
-     name="panel_profile_view"
-     top="0"
-     left="0"
-     height="500"
-     width="420"
-     follows="all"
-     class="panel_profile"
-    >
-        <tab_container
-         name="panel_profile_tabs"
-         top_pad="5"
-         left="0"
-         height="500"
-         width="420"
-         follows="all"
-         layout="topleft"
-         halign="center"
-         tab_min_width="55"
-         tab_position="top"
-        >
-            <panel
-             name="panel_profile_secondlife"
-             label="2nd Life"
-             layout="topleft"
-             class="panel_profile_secondlife"
-             filename="panel_profile_secondlife.xml"
-             help_topic="profile_secondlife_tab"
-            />
-            <panel
-             name="panel_profile_web"
-             label="Web"
-             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="1st 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"
-         bottom_delta="0"
-         right="-10"
-         height="20"
-         width="90"
-         follows="right|bottom"
-         layout="topleft"
-         label_selected="Cancel"
-         visible="false"
-        />
-    </panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+ name="avatarinfo"
+ height="510"
+ width="430"
+ layout="topleft"
+ can_close="true"
+ can_resize="true"
+ help_topic="panel_my_profile_tab"
+ min_height="510"
+ min_width="430"
+ positioning="centered"
+ save_rect="true"
+ title="Profile"
+>
+    <panel
+     name="panel_profile_view"
+     top="0"
+     left="0"
+     height="500"
+     width="420"
+     follows="all"
+     class="panel_profile"
+    >
+        <tab_container
+         name="panel_profile_tabs"
+         top_pad="5"
+         left="0"
+         height="500"
+         width="420"
+         follows="all"
+         layout="topleft"
+         halign="center"
+         tab_min_width="55"
+         tab_position="top"
+        >
+            <panel
+             name="panel_profile_secondlife"
+             label="2nd Life"
+             layout="topleft"
+             class="panel_profile_secondlife"
+             filename="panel_profile_secondlife.xml"
+             help_topic="profile_secondlife_tab"
+            />
+            <panel
+             name="panel_profile_web"
+             label="Web"
+             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="1st 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"
+         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/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
index d08fdc8c7f..e15e050fe1 100644
--- 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
@@ -1,83 +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="0"
-     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>
+<?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="0"
+     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_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
index 291a67ffba..6d6036561b 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -1,711 +1,711 @@
-<?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="350"
->
-    <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="-45"
-     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="570"
-         width="290"
-         follows="left|top"
-         layout="topleft"
-         background_visible="false"
-         min_height="300"
-        >
-            <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"
-             image_name="spacer24.tga"
-             visible="false"
-            />
-            <panel
-             name="info_panel"
-             top="180"
-             left="0"
-             height="520"
-             width="320"
-             follows="all"
-             layout="topleft"
-             visible="true"
-            >
-                <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_stack
-                 name="descr_stack"
-                 top_pad="5"
-                 left="10"
-                 height="215"
-                 width="290"
-                 follows="all"
-                 layout="topleft"
-                 animate="false"
-                 orientation="vertical"
-                >
-                    <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="0"
-                         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="0"
-                         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"
-                    >
-                        <text
-                         name="classified_desc_label"
-                         value="Description:"
-                         top="0"
-                         left="0"
-                         height="10"
-                         width="250"
-                         follows="left|top"
-                         layout="topleft"
-                         font.style="BOLD"
-                         text_color="white"
-                        />
-                        <text_editor
-                         name="classified_desc"
-                         value="[description]"
-                         top_pad="7"
-                         left="0"
-                         height="200"
-                         width="280"
-                         follows="all"
-                         layout="topleft"
-                         allow_scroll="true"
-                         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>
-            <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"
-                 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"
-                />
-                <text
-                 name="price_for_listing_edit_label"
-                 value="Price for listing:"
-                 top_pad="10"
-                 left="10"
-                 height="10"
-                 width="120"
-                 follows="left|top"
-                 layout="topleft"
-                 text_color="white"
-                />
-                <spinner
-                 name="price_for_listing_edit"
-                 label="L$"
-                 value="50"
-                 tool_tip="Price for listing."
-                 top_delta="0"
-                 left_pad="0"
-                 height="23"
-                 width="105"
-                 follows="left|top"
-                 layout="topleft"
-                 decimal_digits="0"
-                 halign="left"
-                 increment="1"
-                 label_width="20"
-                 max_val="99999"
-                 min_val="50"
-                />
-            </panel>
-        </panel>
-    </scroll_container>
-    <panel
-     name="button_panel"
-     bottom="-1"
-     left="9"
-     height="35"
-     follows="left|right|bottom"
-     layout="topleft"
-    >
-        <button
-         name="teleport_btn"
-         label="Teleport"
-         top="0"
-         left="0"
-         height="23"
-         width="101"
-         follows="bottom|left|right"
-         layout="topleft"
-        />
-        <button
-         name="show_on_map_btn"
-         label="Map"
-         top="0"
-         left_pad="5"
-         height="23"
-         width="100"
-         follows="bottom|left|right"
-         layout="topleft"
-        />
-        <button
-         name="edit_btn"
-         label="Edit"
-         top="0"
-         left_pad="5"
-         height="23"
-         width="101"
-         follows="bottom|left|right"
-         layout="topleft"
-        />
-        <button
-         name="save_changes_btn"
-         label="[LABEL]"
-         top="0"
-         left="0"
-         height="23"
-         width="155"
-         follows="bottom|left|right"
-         layout="topleft"
-         visible="false"
-        />
-        <button
-         name="cancel_btn"
-         label="Cancel"
-         top="0"
-         left_pad="5"
-         height="23"
-         width="156"
-         follows="bottom|left|right"
-         layout="topleft"
-         visible="false"
-        />
-    </panel>
-</panel>
+<?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="350"
+>
+    <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="-45"
+     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="570"
+         width="290"
+         follows="left|top"
+         layout="topleft"
+         background_visible="false"
+         min_height="300"
+        >
+            <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"
+             image_name="spacer24.tga"
+             visible="false"
+            />
+            <panel
+             name="info_panel"
+             top="180"
+             left="0"
+             height="520"
+             width="320"
+             follows="all"
+             layout="topleft"
+             visible="true"
+            >
+                <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_stack
+                 name="descr_stack"
+                 top_pad="5"
+                 left="10"
+                 height="215"
+                 width="290"
+                 follows="all"
+                 layout="topleft"
+                 animate="false"
+                 orientation="vertical"
+                >
+                    <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="0"
+                         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="0"
+                         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"
+                    >
+                        <text
+                         name="classified_desc_label"
+                         value="Description:"
+                         top="0"
+                         left="0"
+                         height="10"
+                         width="250"
+                         follows="left|top"
+                         layout="topleft"
+                         font.style="BOLD"
+                         text_color="white"
+                        />
+                        <text_editor
+                         name="classified_desc"
+                         value="[description]"
+                         top_pad="7"
+                         left="0"
+                         height="200"
+                         width="280"
+                         follows="all"
+                         layout="topleft"
+                         allow_scroll="true"
+                         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>
+            <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"
+                 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"
+                />
+                <text
+                 name="price_for_listing_edit_label"
+                 value="Price for listing:"
+                 top_pad="10"
+                 left="10"
+                 height="10"
+                 width="120"
+                 follows="left|top"
+                 layout="topleft"
+                 text_color="white"
+                />
+                <spinner
+                 name="price_for_listing_edit"
+                 label="L$"
+                 value="50"
+                 tool_tip="Price for listing."
+                 top_delta="0"
+                 left_pad="0"
+                 height="23"
+                 width="105"
+                 follows="left|top"
+                 layout="topleft"
+                 decimal_digits="0"
+                 halign="left"
+                 increment="1"
+                 label_width="20"
+                 max_val="99999"
+                 min_val="50"
+                />
+            </panel>
+        </panel>
+    </scroll_container>
+    <panel
+     name="button_panel"
+     bottom="-1"
+     left="9"
+     height="35"
+     follows="left|right|bottom"
+     layout="topleft"
+    >
+        <button
+         name="teleport_btn"
+         label="Teleport"
+         top="0"
+         left="0"
+         height="23"
+         width="101"
+         follows="bottom|left|right"
+         layout="topleft"
+        />
+        <button
+         name="show_on_map_btn"
+         label="Map"
+         top="0"
+         left_pad="5"
+         height="23"
+         width="100"
+         follows="bottom|left|right"
+         layout="topleft"
+        />
+        <button
+         name="edit_btn"
+         label="Edit"
+         top="0"
+         left_pad="5"
+         height="23"
+         width="101"
+         follows="bottom|left|right"
+         layout="topleft"
+        />
+        <button
+         name="save_changes_btn"
+         label="[LABEL]"
+         top="0"
+         left="0"
+         height="23"
+         width="155"
+         follows="bottom|left|right"
+         layout="topleft"
+         visible="false"
+        />
+        <button
+         name="cancel_btn"
+         label="Cancel"
+         top="0"
+         left_pad="5"
+         height="23"
+         width="156"
+         follows="bottom|left|right"
+         layout="topleft"
+         visible="false"
+        />
+    </panel>
+</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
index 3c0ff2b10c..91a1a183e0 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
@@ -1,76 +1,76 @@
-<?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..."
-     enabled="false"
-     top="25"
-     left="5"
-     height="20"
-     width="70"
-     follows="left|top"
-     layout="topleft"
-     visible="true"
-    />
-    <button
-     name="delete_btn"
-     label="Delete..."
-     enabled="false"
-     left_pad="5"
-     height="20"
-     width="70"
-     follows="left|top"
-     layout="topleft"
-     visible="true"
-    />
-    <tab_container
-     name="tab_classifieds"
-     top="50"
-     bottom="-5"
-     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>
+<?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..."
+     enabled="false"
+     top="25"
+     left="5"
+     height="20"
+     width="70"
+     follows="left|top"
+     layout="topleft"
+     visible="true"
+    />
+    <button
+     name="delete_btn"
+     label="Delete..."
+     enabled="false"
+     left_pad="5"
+     height="20"
+     width="70"
+     follows="left|top"
+     layout="topleft"
+     visible="true"
+    />
+    <tab_container
+     name="tab_classifieds"
+     top="50"
+     bottom="-5"
+     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
index 957b5fe05e..328f9a87b4 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -1,59 +1,59 @@
-<?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="275"
-     follows="top|left"
-     layout="topleft"
-     allow_no_texture="true"
-     default_image_name="None"
-     fallback_image="Generic_Person_Large"
-    />
-    <view_border
-     name="info_border"
-     top="225"
-     left="6"
-     right="-6"
-     height="185"
-     follows="all"
-     layout="topleft"
-     bevel_style="in"
-    />
-    <text_editor
-     name="fl_description_edit"
-     enabled="false"
-     top_delta="1"
-     left_delta="1"
-     right="-7"
-     height="183"
-     follows="all"
-     layout="topleft"
-     bg_readonly_color="Transparent"
-     max_length="253"
-     parse_urls="true"
-     word_wrap="true"
-    />
-</panel>
+<?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="275"
+     follows="top|left"
+     layout="topleft"
+     allow_no_texture="true"
+     default_image_name="None"
+     fallback_image="Generic_Person_Large"
+    />
+    <view_border
+     name="info_border"
+     top="225"
+     left="6"
+     right="-6"
+     height="185"
+     follows="all"
+     layout="topleft"
+     bevel_style="in"
+    />
+    <text_editor
+     name="fl_description_edit"
+     enabled="false"
+     top_delta="1"
+     left_delta="1"
+     right="-7"
+     height="183"
+     follows="all"
+     layout="topleft"
+     bg_readonly_color="Transparent"
+     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
index 5a943ccf4d..0359b0bc4b 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_interests.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_interests.xml
@@ -1,250 +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>
+<?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
index 1be7edbcea..0bafaac361 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
@@ -1,86 +1,86 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- name="panel_notes"
- label="Notes &amp; 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>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ name="panel_notes"
+ label="Notes &amp; 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
index 40f3f83320..f075b42b94 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
@@ -1,109 +1,109 @@
-<?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|right|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"
-     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>
+<?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|right|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"
+     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
index 7d0bb16b16..dc6265b791 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_picks.xml
@@ -1,87 +1,87 @@
-<?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..."
-     enabled="false"
-     top_pad="4"
-     left="5"
-     height="20"
-     width="70"
-     follows="left|top"
-     layout="topleft"
-     visible="false"
-    />
-    <button
-     name="delete_btn"
-     label="Delete..."
-     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>
+<?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..."
+     enabled="false"
+     top_pad="4"
+     left="5"
+     height="20"
+     width="70"
+     follows="left|top"
+     layout="topleft"
+     visible="false"
+    />
+    <button
+     name="delete_btn"
+     label="Delete..."
+     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
index ae1a91325f..ad9448f457 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -1,512 +1,512 @@
-<?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"
-    >
-    </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"
-    />
-    <!--
-
-KC: Use view_border's around text_editor's due to text render issues with border_visible
-
--->
-    <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"
-    />
-    <view_border
-     name="info_border"
-     left_pad="4"
-     right="-6"
-     height="20"
-     follows="left|top|right"
-     layout="topleft"
-     bevel_style="in"
-    />
-    <text_editor
-     name="complete_name"
-     value="(loading...)"
-     enabled="false"
-     top_delta="0"
-     left_delta="3"
-     right="-6"
-     height="20"
-     follows="left|top|right"
-     layout="topleft"
-     allow_scroll="false"
-     bg_visible="false"
-     border_visible="false"
-     h_pad="1"
-     v_pad="2"
-     max_length="254"
-    />
-    <texture_picker
-     name="2nd_life_pic"
-     enabled="false"
-     top_pad="6"
-     left_delta="0"
-     height="180"
-     width="220"
-     follows="top|left"
-     layout="topleft"
-     allow_no_texture="true"
-     default_image_name="None"
-     fallback_image="Generic_Person_Large"
-    />
-    <text
-     name="status"
-     value="Status Unknown"
-     top_delta="1"
-     left_pad="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"
-    />
-    <view_border
-     name="info_border3"
-     top_pad="0"
-     right="-6"
-     height="16"
-     follows="top|left|right"
-     layout="topleft"
-     bevel_style="in"
-    />
-    <text_editor
-     name="register_date"
-     value="(loading...)"
-     top_delta="0"
-     left_delta="2"
-     right="-6"
-     height="16"
-     follows="top|left|right"
-     layout="topleft"
-     allow_scroll="false"
-     bg_visible="false"
-     border_visible="false"
-     h_pad="2"
-     max_length="254"
-     read_only="true"
-     translate="false"
-     v_pad="0"
-     word_wrap="true"
-    />
-    <text
-     name="label2"
-     value="Account:"
-     top_pad="6"
-     left_delta="-2"
-     right="-6"
-     height="16"
-     follows="top|left"
-     layout="topleft"
-    />
-    <view_border
-     name="acct_border"
-     top_pad="0"
-     left_delta="0"
-     right="-6"
-     height="48"
-     follows="top|left|right"
-     layout="topleft"
-     bevel_style="in"
-    />
-    <text_editor
-     name="acc_status_text"
-     top_delta="0"
-     left_delta="2"
-     right="-6"
-     height="44"
-     follows="top|left|right"
-     layout="topleft"
-     allow_scroll="false"
-     bg_visible="false"
-     border_visible="false"
-     h_pad="2"
-     read_only="true"
-     translate="false"
-     v_pad="0"
-     word_wrap="true"
-    />
-    <text
-     name="partner_label"
-     value="Partner:"
-     top_pad="6"
-     left_delta="-2"
-     right="-6"
-     height="16"
-     follows="top|left"
-     layout="topleft"
-    />
-    <view_border
-     name="info_border4"
-     top_pad="0"
-     left_delta="0"
-     right="-6"
-     height="18"
-     follows="top|left|right"
-     layout="topleft"
-     bevel_style="in"
-    />
-    <text
-     name="partner_text"
-     top_delta="2"
-     left_delta="2"
-     right="-6"
-     height="16"
-     follows="top|left|right"
-     layout="topleft"
-     max_length="254"
-    />
-    <text
-     name="Groups:"
-     value="Groups:"
-     top_pad="8"
-     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="-6"
-     height="80"
-     follows="left|top|right"
-     layout="topleft"
-     border_visible="true"
-     color="ScrollBgWriteableColor"
-     for_agent="false"
-    />
-    <text
-     name="About:"
-     value="About:"
-     top_pad="8"
-     left="6"
-     height="16"
-     width="55"
-     follows="left|top"
-     layout="topleft"
-     halign="right"
-    />
-    <view_border
-     name="info_border5"
-     top_delta="0"
-     left="66"
-     right="-6"
-     height="102"
-     follows="all"
-     layout="topleft"
-     bevel_style="in"
-    />
-    <text_editor
-     name="sl_description_edit"
-     enabled="false"
-     top_delta="1"
-     left_delta="1"
-     right="-7"
-     height="100"
-     follows="all"
-     layout="topleft"
-     bg_readonly_color="Transparent"
-     border_visible="false"
-     font="SansSerifSmall"
-     h_pad="2"
-     max_length="510"
-     parse_urls="true"
-     word_wrap="true"
-    />
-    <text
-     name="Give item:"
-     value="Give item:"
-     top_pad="10"
-     left="6"
-     height="16"
-     width="55"
-     follows="left|bottom"
-     layout="topleft"
-     halign="right"
-    />
-    <view_border
-     name="drop_target_rect_vis"
-     top_delta="0"
-     left="66"
-     right="-6"
-     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="66"
-     right="-6"
-     height="16"
-     follows="left|bottom|right"
-     layout="topleft"
-     halign="center"
-    >
-        Drop inventory item here.
-    </text>
-    <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"
-             right="-40"
-             follows="left|top|right"
-             layout="topleft"
-            />
-        </layout_panel>
-    </layout_stack>
-    <check_box
-     name="show_in_search_checkbox"
-     label="Show in search"
-     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>
+<?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"
+    >
+    </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"
+    />
+    <!--
+
+KC: Use view_border's around text_editor's due to text render issues with border_visible
+
+-->
+    <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"
+    />
+    <view_border
+     name="info_border"
+     left_pad="4"
+     right="-6"
+     height="20"
+     follows="left|top|right"
+     layout="topleft"
+     bevel_style="in"
+    />
+    <text_editor
+     name="complete_name"
+     value="(loading...)"
+     enabled="false"
+     top_delta="0"
+     left_delta="3"
+     right="-6"
+     height="20"
+     follows="left|top|right"
+     layout="topleft"
+     allow_scroll="false"
+     bg_visible="false"
+     border_visible="false"
+     h_pad="1"
+     v_pad="2"
+     max_length="254"
+    />
+    <texture_picker
+     name="2nd_life_pic"
+     enabled="false"
+     top_pad="6"
+     left_delta="0"
+     height="180"
+     width="220"
+     follows="top|left"
+     layout="topleft"
+     allow_no_texture="true"
+     default_image_name="None"
+     fallback_image="Generic_Person_Large"
+    />
+    <text
+     name="status"
+     value="Status Unknown"
+     top_delta="1"
+     left_pad="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"
+    />
+    <view_border
+     name="info_border3"
+     top_pad="0"
+     right="-6"
+     height="16"
+     follows="top|left|right"
+     layout="topleft"
+     bevel_style="in"
+    />
+    <text_editor
+     name="register_date"
+     value="(loading...)"
+     top_delta="0"
+     left_delta="2"
+     right="-6"
+     height="16"
+     follows="top|left|right"
+     layout="topleft"
+     allow_scroll="false"
+     bg_visible="false"
+     border_visible="false"
+     h_pad="2"
+     max_length="254"
+     read_only="true"
+     translate="false"
+     v_pad="0"
+     word_wrap="true"
+    />
+    <text
+     name="label2"
+     value="Account:"
+     top_pad="6"
+     left_delta="-2"
+     right="-6"
+     height="16"
+     follows="top|left"
+     layout="topleft"
+    />
+    <view_border
+     name="acct_border"
+     top_pad="0"
+     left_delta="0"
+     right="-6"
+     height="48"
+     follows="top|left|right"
+     layout="topleft"
+     bevel_style="in"
+    />
+    <text_editor
+     name="acc_status_text"
+     top_delta="0"
+     left_delta="2"
+     right="-6"
+     height="44"
+     follows="top|left|right"
+     layout="topleft"
+     allow_scroll="false"
+     bg_visible="false"
+     border_visible="false"
+     h_pad="2"
+     read_only="true"
+     translate="false"
+     v_pad="0"
+     word_wrap="true"
+    />
+    <text
+     name="partner_label"
+     value="Partner:"
+     top_pad="6"
+     left_delta="-2"
+     right="-6"
+     height="16"
+     follows="top|left"
+     layout="topleft"
+    />
+    <view_border
+     name="info_border4"
+     top_pad="0"
+     left_delta="0"
+     right="-6"
+     height="18"
+     follows="top|left|right"
+     layout="topleft"
+     bevel_style="in"
+    />
+    <text
+     name="partner_text"
+     top_delta="2"
+     left_delta="2"
+     right="-6"
+     height="16"
+     follows="top|left|right"
+     layout="topleft"
+     max_length="254"
+    />
+    <text
+     name="Groups:"
+     value="Groups:"
+     top_pad="8"
+     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="-6"
+     height="80"
+     follows="left|top|right"
+     layout="topleft"
+     border_visible="true"
+     color="ScrollBgWriteableColor"
+     for_agent="false"
+    />
+    <text
+     name="About:"
+     value="About:"
+     top_pad="8"
+     left="6"
+     height="16"
+     width="55"
+     follows="left|top"
+     layout="topleft"
+     halign="right"
+    />
+    <view_border
+     name="info_border5"
+     top_delta="0"
+     left="66"
+     right="-6"
+     height="102"
+     follows="all"
+     layout="topleft"
+     bevel_style="in"
+    />
+    <text_editor
+     name="sl_description_edit"
+     enabled="false"
+     top_delta="1"
+     left_delta="1"
+     right="-7"
+     height="100"
+     follows="all"
+     layout="topleft"
+     bg_readonly_color="Transparent"
+     border_visible="false"
+     font="SansSerifSmall"
+     h_pad="2"
+     max_length="510"
+     parse_urls="true"
+     word_wrap="true"
+    />
+    <text
+     name="Give item:"
+     value="Give item:"
+     top_pad="10"
+     left="6"
+     height="16"
+     width="55"
+     follows="left|bottom"
+     layout="topleft"
+     halign="right"
+    />
+    <view_border
+     name="drop_target_rect_vis"
+     top_delta="0"
+     left="66"
+     right="-6"
+     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="66"
+     right="-6"
+     height="16"
+     follows="left|bottom|right"
+     layout="topleft"
+     halign="center"
+    >
+        Drop inventory item here.
+    </text>
+    <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"
+             right="-40"
+             follows="left|top|right"
+             layout="topleft"
+            />
+        </layout_panel>
+    </layout_stack>
+    <check_box
+     name="show_in_search_checkbox"
+     label="Show in search"
+     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
index 265de3d1b6..97e245dc24 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_web.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_web.xml
@@ -1,92 +1,92 @@
-<?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"
-    />
-    <line_editor
-     name="url_edit"
-     enabled="false"
-     top_pad="5"
-     left="10"
-     height="16"
-     width="400"
-     follows="left|top"
-     layout="topleft"
-     text_pad_left="4"
-     max_length_bytes="254"
-    >
-        (loading..)
-    </line_editor>
-    <flyout_button
-     name="load"
-     label="Load"
-     tool_tip="Load this profile page with embedded web browser."
-     enabled="false"
-     top_pad="5"
-     left="10"
-     height="18"
-     width="80"
-     follows="left|top"
-     layout="topleft"
-    >
-        <flyout_button.item
-         name="open_item"
-         label="Open in-viewer browser"
-         value="popout"
-        />
-        <flyout_button.item
-         name="home_item"
-         label="Open external browser"
-         value="external"
-        />
-    </flyout_button>
-    <loading_indicator
-     name="progress_indicator"
-     left_pad="100"
-     height="23"
-     width="23"
-     follows="top|left"
-     layout="topleft"
-     visible="false"
-    />
-    <button
-     name="web_profile_popout_btn"
-     top_delta="5"
-     right="-10"
-     height="16"
-     width="16"
-     follows="right|top"
-     layout="topleft"
-     image_overlay="tearoffbox.tga"
-     tool_tip="Popout web profile"
-    />
-    <web_browser
-     name="profile_html"
-     top="48"
-     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>
+<?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"
+    />
+    <line_editor
+     name="url_edit"
+     enabled="false"
+     top_pad="5"
+     left="10"
+     height="16"
+     width="400"
+     follows="left|top"
+     layout="topleft"
+     text_pad_left="4"
+     max_length_bytes="254"
+    >
+        (loading..)
+    </line_editor>
+    <flyout_button
+     name="load"
+     label="Load"
+     tool_tip="Load this profile page with embedded web browser."
+     enabled="false"
+     top_pad="5"
+     left="10"
+     height="18"
+     width="80"
+     follows="left|top"
+     layout="topleft"
+    >
+        <flyout_button.item
+         name="open_item"
+         label="Open in-viewer browser"
+         value="popout"
+        />
+        <flyout_button.item
+         name="home_item"
+         label="Open external browser"
+         value="external"
+        />
+    </flyout_button>
+    <loading_indicator
+     name="progress_indicator"
+     left_pad="100"
+     height="23"
+     width="23"
+     follows="top|left"
+     layout="topleft"
+     visible="false"
+    />
+    <button
+     name="web_profile_popout_btn"
+     top_delta="5"
+     right="-10"
+     height="16"
+     width="16"
+     follows="right|top"
+     layout="topleft"
+     image_overlay="tearoffbox.tga"
+     tool_tip="Popout web profile"
+    />
+    <web_browser
+     name="profile_html"
+     top="48"
+     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>
-- 
cgit v1.2.3


From 1917ca123eb4415f8c6fd4aa40661708eba968bd Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Mon, 4 Mar 2019 21:20:22 -0800
Subject: Fixed account info not showing on profile

---
 indra/newview/skins/default/xui/en/panel_profile_secondlife.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index ae1a91325f..d791e1d4f3 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -22,6 +22,8 @@
     <string
      name="CaptionTextAcctInfo"
     >
+       [ACCTTYPE]
+[PAYMENTINFO]
     </string>
     <string
      name="payment_update_link_url"
@@ -200,7 +202,7 @@ KC: Use view_border's around text_editor's due to text render issues with border
      max_length="254"
      read_only="true"
      translate="false"
-     v_pad="0"
+     v_pad="2"
      word_wrap="true"
     />
     <text
@@ -215,7 +217,7 @@ KC: Use view_border's around text_editor's due to text render issues with border
     />
     <view_border
      name="acct_border"
-     top_pad="0"
+     top_pad="1"
      left_delta="0"
      right="-6"
      height="48"
@@ -237,7 +239,7 @@ KC: Use view_border's around text_editor's due to text render issues with border
      h_pad="2"
      read_only="true"
      translate="false"
-     v_pad="0"
+     v_pad="2"
      word_wrap="true"
     />
     <text
-- 
cgit v1.2.3


From f0208fa72f2cc980ec9ca2b954a680b94392ffff Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Mon, 4 Mar 2019 22:57:22 -0800
Subject: Removed redundant view_border elements

---
 .../default/xui/en/panel_profile_firstlife.xml     | 15 +---
 .../default/xui/en/panel_profile_secondlife.xml    | 89 ++++++----------------
 2 files changed, 25 insertions(+), 79 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index 957b5fe05e..91675900dc 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -32,26 +32,17 @@
      default_image_name="None"
      fallback_image="Generic_Person_Large"
     />
-    <view_border
-     name="info_border"
-     top="225"
-     left="6"
-     right="-6"
-     height="185"
-     follows="all"
-     layout="topleft"
-     bevel_style="in"
-    />
     <text_editor
      name="fl_description_edit"
      enabled="false"
-     top_delta="1"
-     left_delta="1"
+     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"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index d791e1d4f3..73c25a770c 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -78,11 +78,6 @@
      name="FSGW"
      value=" Gateway"
     />
-    <!--
-
-KC: Use view_border's around text_editor's due to text render issues with border_visible
-
--->
     <loading_indicator
      name="progress_indicator"
      top="4"
@@ -117,28 +112,19 @@ KC: Use view_border's around text_editor's due to text render issues with border
      layout="topleft"
      visible="false"
     />
-    <view_border
-     name="info_border"
-     left_pad="4"
-     right="-6"
-     height="20"
-     follows="left|top|right"
-     layout="topleft"
-     bevel_style="in"
-    />
     <text_editor
      name="complete_name"
      value="(loading...)"
      enabled="false"
      top_delta="0"
-     left_delta="3"
+     left_pad="4"
      right="-6"
      height="20"
      follows="left|top|right"
      layout="topleft"
      allow_scroll="false"
      bg_visible="false"
-     border_visible="false"
+     border_visible="true"
      h_pad="1"
      v_pad="2"
      max_length="254"
@@ -177,19 +163,10 @@ KC: Use view_border's around text_editor's due to text render issues with border
      follows="top|left"
      layout="topleft"
     />
-    <view_border
-     name="info_border3"
-     top_pad="0"
-     right="-6"
-     height="16"
-     follows="top|left|right"
-     layout="topleft"
-     bevel_style="in"
-    />
     <text_editor
      name="register_date"
      value="(loading...)"
-     top_delta="0"
+     top_pad="0"
      left_delta="2"
      right="-6"
      height="16"
@@ -197,7 +174,7 @@ KC: Use view_border's around text_editor's due to text render issues with border
      layout="topleft"
      allow_scroll="false"
      bg_visible="false"
-     border_visible="false"
+     border_visible="true"
      h_pad="2"
      max_length="254"
      read_only="true"
@@ -208,26 +185,16 @@ KC: Use view_border's around text_editor's due to text render issues with border
     <text
      name="label2"
      value="Account:"
-     top_pad="6"
+     top_pad="5"
      left_delta="-2"
      right="-6"
      height="16"
      follows="top|left"
      layout="topleft"
     />
-    <view_border
-     name="acct_border"
-     top_pad="1"
-     left_delta="0"
-     right="-6"
-     height="48"
-     follows="top|left|right"
-     layout="topleft"
-     bevel_style="in"
-    />
     <text_editor
      name="acc_status_text"
-     top_delta="0"
+     top_pad="0"
      left_delta="2"
      right="-6"
      height="44"
@@ -235,7 +202,7 @@ KC: Use view_border's around text_editor's due to text render issues with border
      layout="topleft"
      allow_scroll="false"
      bg_visible="false"
-     border_visible="false"
+     border_visible="true"
      h_pad="2"
      read_only="true"
      translate="false"
@@ -245,31 +212,29 @@ KC: Use view_border's around text_editor's due to text render issues with border
     <text
      name="partner_label"
      value="Partner:"
-     top_pad="6"
+     top_pad="5"
      left_delta="-2"
      right="-6"
      height="16"
      follows="top|left"
      layout="topleft"
     />
-    <view_border
-     name="info_border4"
+    <text_editor
+     name="partner_text"
      top_pad="0"
      left_delta="0"
      right="-6"
-     height="18"
-     follows="top|left|right"
-     layout="topleft"
-     bevel_style="in"
-    />
-    <text
-     name="partner_text"
-     top_delta="2"
-     left_delta="2"
-     right="-6"
-     height="16"
+     height="20"
      follows="top|left|right"
      layout="topleft"
+     allow_scroll="false"
+     bg_visible="false"
+     border_visible="true"
+     parse_urls="true"
+     h_pad="0"
+     read_only="true"
+     translate="false"
+     v_pad="2"
      max_length="254"
     />
     <text
@@ -318,27 +283,17 @@ KC: Use view_border's around text_editor's due to text render issues with border
      layout="topleft"
      halign="right"
     />
-    <view_border
-     name="info_border5"
-     top_delta="0"
-     left="66"
-     right="-6"
-     height="102"
-     follows="all"
-     layout="topleft"
-     bevel_style="in"
-    />
     <text_editor
      name="sl_description_edit"
      enabled="false"
-     top_delta="1"
-     left_delta="1"
+     top_delta="0"
+     left="66"
      right="-7"
      height="100"
      follows="all"
      layout="topleft"
      bg_readonly_color="Transparent"
-     border_visible="false"
+     border_visible="true"
      font="SansSerifSmall"
      h_pad="2"
      max_length="510"
-- 
cgit v1.2.3


From cf04305d04bb478fcee4ae75ce6377595d0ec4a8 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 18 Mar 2019 20:29:08 +0200
Subject: SL-10728 and SL-10729 Legacy profile overlaps

---
 .../skins/default/xui/en/panel_edit_classified.xml |   2 +-
 .../default/xui/en/panel_profile_classified.xml    | 166 ++++++++++++++-------
 .../default/xui/en/panel_profile_classifieds.xml   |   2 +-
 3 files changed, 111 insertions(+), 59 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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 3509eaa285..f8913d12c6 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -337,7 +337,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_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
index 6d6036561b..bbbb4e0f4a 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -64,7 +64,7 @@
      name="profile_scroll"
      top="0"
      left="0"
-     bottom="-45"
+     bottom="-35"
      width="320"
      follows="all"
      layout="topleft"
@@ -647,65 +647,117 @@
             </panel>
         </panel>
     </scroll_container>
-    <panel
-     name="button_panel"
+    <layout_stack
+     name="edit_btns_pnl"
      bottom="-1"
      left="9"
-     height="35"
+     height="25"
      follows="left|right|bottom"
      layout="topleft"
+     orientation="horizontal"
+     animate="false"
     >
-        <button
-         name="teleport_btn"
-         label="Teleport"
-         top="0"
-         left="0"
-         height="23"
-         width="101"
-         follows="bottom|left|right"
-         layout="topleft"
-        />
-        <button
-         name="show_on_map_btn"
-         label="Map"
-         top="0"
-         left_pad="5"
-         height="23"
-         width="100"
-         follows="bottom|left|right"
-         layout="topleft"
-        />
-        <button
-         name="edit_btn"
-         label="Edit"
-         top="0"
-         left_pad="5"
-         height="23"
-         width="101"
-         follows="bottom|left|right"
-         layout="topleft"
-        />
-        <button
-         name="save_changes_btn"
-         label="[LABEL]"
-         top="0"
-         left="0"
-         height="23"
-         width="155"
-         follows="bottom|left|right"
-         layout="topleft"
-         visible="false"
-        />
-        <button
-         name="cancel_btn"
-         label="Cancel"
-         top="0"
-         left_pad="5"
-         height="23"
-         width="156"
-         follows="bottom|left|right"
-         layout="topleft"
-         visible="false"
-        />
-    </panel>
+        <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
index 91a1a183e0..fc6b92ed2f 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
@@ -49,7 +49,7 @@
     <tab_container
      name="tab_classifieds"
      top="50"
-     bottom="-5"
+     bottom="-21"
      left="4"
      right="-4"
      follows="all"
-- 
cgit v1.2.3


From eaa50876b52b6134d9ee068829d904235179be7c Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 22 Mar 2019 17:06:45 +0200
Subject: SL-10792 Updated tab labels and width

---
 indra/newview/skins/default/xui/en/floater_profile.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml
index e1f4f0b010..865855a749 100644
--- a/indra/newview/skins/default/xui/en/floater_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile.xml
@@ -2,13 +2,13 @@
 <floater
  name="avatarinfo"
  height="510"
- width="430"
+ width="450"
  layout="topleft"
  can_close="true"
  can_resize="true"
  help_topic="panel_my_profile_tab"
  min_height="510"
- min_width="430"
+ min_width="450"
  positioning="centered"
  save_rect="true"
  title="Profile"
@@ -18,7 +18,7 @@
      top="0"
      left="0"
      height="500"
-     width="420"
+     width="445"
      follows="all"
      class="panel_profile"
     >
@@ -27,7 +27,7 @@
          top_pad="5"
          left="0"
          height="500"
-         width="420"
+         width="445"
          follows="all"
          layout="topleft"
          halign="center"
@@ -36,7 +36,7 @@
         >
             <panel
              name="panel_profile_secondlife"
-             label="2nd Life"
+             label="Second Life"
              layout="topleft"
              class="panel_profile_secondlife"
              filename="panel_profile_secondlife.xml"
@@ -76,7 +76,7 @@
             />
             <panel
              name="panel_profile_firstlife"
-             label="1st Life"
+             label="Real Life"
              layout="topleft"
              class="panel_profile_firstlife"
              filename="panel_profile_firstlife.xml"
-- 
cgit v1.2.3


From 30cd4db57e105efe164a433f61847998c4c03784 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 22 Mar 2019 22:14:45 +0200
Subject: SL-10799 [Legacy Profiles] Profile picture is too stretched

---
 indra/newview/skins/default/xui/en/panel_profile_firstlife.xml  | 2 +-
 indra/newview/skins/default/xui/en/panel_profile_secondlife.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index f9b6f5c62a..53cdc0f061 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -25,7 +25,7 @@
      top="10"
      left="6"
      height="225"
-     width="275"
+     width="225"
      follows="top|left"
      layout="topleft"
      allow_no_texture="true"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 27d09386b9..b6d767bbba 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -135,7 +135,7 @@
      top_pad="6"
      left_delta="0"
      height="180"
-     width="220"
+     width="180"
      follows="top|left"
      layout="topleft"
      allow_no_texture="true"
-- 
cgit v1.2.3


From 90297f27547e7f9c591079cd99860e4a9f5e7f2c Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 25 Mar 2019 15:18:31 +0200
Subject: SL-10805 [Legacy Profiles] Picks tab, resizing floater should not
 stretch images

---
 indra/newview/skins/default/xui/en/panel_profile_pick.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_pick.xml b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
index f075b42b94..eab62d8211 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
@@ -20,7 +20,7 @@
      left="10"
      height="180"
      width="290"
-     follows="left|right|top"
+     follows="left|top"
      layout="topleft"
      fallback_image="default_land_picture.j2c"
     />
-- 
cgit v1.2.3


From 458d318aebd7a7da8ea2c594b8df2f285f7efded Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 25 Mar 2019 17:19:11 +0200
Subject: SL-10804 [Legacy Profiles] Second Life tab block button size and
 focus

---
 indra/newview/skins/default/xui/en/panel_profile_secondlife.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index b6d767bbba..1232439b1e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -438,7 +438,7 @@
              label="Unblock"
              tool_tip="Unblock this Resident"
              top_delta="0"
-             right="-40"
+             height="20"
              follows="left|top|right"
              layout="topleft"
             />
-- 
cgit v1.2.3


From 5143456f51d32b90a94b6c01aebb74c3503a3e27 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 25 Mar 2019 18:09:23 +0200
Subject: SL-10799 [Legacy Profiles] added 3x4 image dimentions support

---
 .../default/xui/en/panel_profile_secondlife.xml    | 240 ++++++++++++---------
 1 file changed, 135 insertions(+), 105 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 1232439b1e..8ebb1522b4 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -129,118 +129,148 @@
      v_pad="2"
      max_length="254"
     />
-    <texture_picker
-     name="2nd_life_pic"
-     enabled="false"
+    <layout_stack
+     name="imagepositioner"
      top_pad="6"
      left_delta="0"
-     height="180"
-     width="180"
-     follows="top|left"
-     layout="topleft"
-     allow_no_texture="true"
-     default_image_name="None"
-     fallback_image="Generic_Person_Large"
-    />
-    <text
-     name="status"
-     value="Status Unknown"
-     top_delta="1"
-     left_pad="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"
+     right="-1"
+     height="158"
      follows="top|left|right"
      layout="topleft"
-     allow_scroll="false"
-     bg_visible="false"
-     border_visible="true"
-     parse_urls="true"
-     h_pad="0"
-     read_only="true"
-     translate="false"
-     v_pad="2"
-     max_length="254"
-    />
+     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"
+             enabled="false"
+             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="0"
+             read_only="true"
+             translate="false"
+             v_pad="2"
+             max_length="254"
+             />
+        </layout_panel>
+    </layout_stack>
     <text
      name="Groups:"
      value="Groups:"
-     top_pad="8"
+     top_pad="7"
      left="6"
      height="16"
      width="55"
-- 
cgit v1.2.3


From 88c9fe9c6f7a44f040af59dfa88fd65fb6a23686 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 26 Mar 2019 15:23:48 +0200
Subject: SL-10799 [Legacy Profiles] Acounted for 23px label in 'real life'
 texture

---
 indra/newview/skins/default/xui/en/panel_profile_firstlife.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index 53cdc0f061..2f4656c2a7 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -25,7 +25,7 @@
      top="10"
      left="6"
      height="225"
-     width="225"
+     width="202"
      follows="top|left"
      layout="topleft"
      allow_no_texture="true"
-- 
cgit v1.2.3


From 71e4e26ebe96a03b63e1dae99bd13ec9c3bd2dbb Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 27 Mar 2019 19:04:49 +0200
Subject: SL-10806 [Legacy Profiles] Classified tab, classifieds contain two
 scrollbars

---
 .../default/xui/en/panel_profile_classified.xml    | 599 +++++++++++----------
 1 file changed, 301 insertions(+), 298 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
index bbbb4e0f4a..6a0489ae97 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -8,7 +8,7 @@
  follows="all"
  layout="topleft"
  help_topic="panel_profile_classified"
- min_height="350"
+ min_height="250"
 >
     <panel.string
      name="type_mature"
@@ -76,12 +76,12 @@
          name="info_scroll_content_panel"
          top="0"
          left="0"
-         height="570"
+         height="562"
          width="290"
          follows="left|top"
          layout="topleft"
          background_visible="false"
-         min_height="300"
+         min_height="200"
         >
             <texture_picker
              name="classified_snapshot"
@@ -103,327 +103,330 @@
              height="197"
              width="272"
              layout="topleft"
+             follows="left|top|right"
              image_name="spacer24.tga"
              visible="false"
             />
-            <panel
+            <layout_stack
              name="info_panel"
              top="180"
              left="0"
-             height="520"
+             height="375"
              width="320"
              follows="all"
              layout="topleft"
              visible="true"
-            >
-                <text_editor
-                 name="classified_name"
+             animate="false"
+             orientation="vertical"
+             >
+                <layout_panel
+                 name="main_info_panel"
                  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"
+                 left="0"
+                 height="160"
                  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"
+                 follows="all"
                  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"
+                 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="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"
+                 width="290"
+                 follows="all"
                  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"
+                 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="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_stack
-                 name="descr_stack"
-                 top_pad="5"
-                 left="10"
-                 height="215"
                  width="290"
                  follows="all"
                  layout="topleft"
-                 animate="false"
-                 orientation="vertical"
-                >
-                    <layout_panel
-                     name="clickthrough_layout_panel"
+                 auto_resize="false"
+                 >
+                    <text
+                     name="auto_renew_label"
+                     value="Auto renew:"
                      top="0"
-                     left="0"
-                     height="16"
-                     width="290"
-                     follows="all"
+                     left="10"
+                     height="10"
+                     width="140"
+                     follows="left|top"
                      layout="topleft"
-                     auto_resize="false"
-                    >
-                        <text
-                         name="click_through_label"
-                         value="Clicks:"
-                         top_pad="0"
-                         left="0"
-                         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"
+                     font.style="BOLD"
+                     text_color="white"
+                     />
+                    <text
+                     name="auto_renew"
+                     value="Enabled"
+                     top_pad="-10"
+                     left_pad="0"
                      height="16"
-                     width="290"
-                     follows="all"
+                     width="150"
+                     follows="top|left"
                      layout="topleft"
-                     auto_resize="false"
-                    >
-                        <text
-                         name="auto_renew_label"
-                         value="Auto renew:"
-                         top="0"
-                         left="0"
-                         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"
+                     />
+                </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="0"
-                     height="220"
-                     width="290"
+                     left="10"
+                     height="10"
+                     width="250"
+                     follows="left|top"
+                     layout="topleft"
+                     font.style="BOLD"
+                     text_color="white"
+                     />
+                    <text_editor
+                     name="classified_desc"
+                     value="[description]"
+                     top_pad="7"
+                     left="10"
+                     height="200"
+                     width="280"
                      follows="all"
                      layout="topleft"
-                    >
-                        <text
-                         name="classified_desc_label"
-                         value="Description:"
-                         top="0"
-                         left="0"
-                         height="10"
-                         width="250"
-                         follows="left|top"
-                         layout="topleft"
-                         font.style="BOLD"
-                         text_color="white"
-                        />
-                        <text_editor
-                         name="classified_desc"
-                         value="[description]"
-                         top_pad="7"
-                         left="0"
-                         height="200"
-                         width="280"
-                         follows="all"
-                         layout="topleft"
-                         allow_scroll="true"
-                         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>
+                     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"
-- 
cgit v1.2.3


From 8a3fce881fbf971046be50d9d7198e58772e3164 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 18 Apr 2019 19:26:37 +0300
Subject: SL-10791 [Legacy Profiles] Functionality to copy agent id and name
 from profile

---
 .../skins/default/xui/en/menu_name_field.xml       | 22 ++++++++++
 .../default/xui/en/panel_profile_secondlife.xml    | 48 +++++++++++++++++-----
 2 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_name_field.xml

(limited to 'indra/newview/skins/default/xui/en')

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/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 8ebb1522b4..e577e6a4d2 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -112,23 +112,51 @@
      layout="topleft"
      visible="false"
     />
-    <text_editor
-     name="complete_name"
-     value="(loading...)"
-     enabled="false"
+    <panel
+     name="name_holder"
      top_delta="0"
      left_pad="4"
-     right="-6"
+     right="-5"
      height="20"
      follows="left|top|right"
      layout="topleft"
      allow_scroll="false"
      bg_visible="false"
-     border_visible="true"
-     h_pad="1"
-     v_pad="2"
-     max_length="254"
-    />
+     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="2"
+       max_length="254"
+      />
+      <!--mouse_opaque="true"-->
+      <menu_button
+       name="copy_btn"
+       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"
-- 
cgit v1.2.3


From 6d64ba263079546198bd8c4e1890eb39c4eb3a0c Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 24 Apr 2019 18:54:50 +0300
Subject: SL-11023 [Legacy Profiles] Selection is too low in some field of
 profile floater

---
 indra/newview/skins/default/xui/en/panel_group_list_item_short.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_profile_secondlife.xml    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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
index e15e050fe1..fb46d1cce3 100644
--- 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
@@ -43,7 +43,7 @@
     <text
      name="group_name"
      value="Unknown"
-     top="0"
+     top="2"
      left_pad="5"
      right="-2"
      height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index e577e6a4d2..a5f486d4a1 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -137,7 +137,7 @@
        bg_visible="false"
        border_visible="true"
        h_pad="1"
-       v_pad="2"
+       v_pad="4"
        max_length="254"
       />
       <!--mouse_opaque="true"-->
@@ -287,10 +287,10 @@
              bg_visible="false"
              border_visible="true"
              parse_urls="true"
-             h_pad="0"
+             h_pad="1"
              read_only="true"
              translate="false"
-             v_pad="2"
+             v_pad="4"
              max_length="254"
              />
         </layout_panel>
-- 
cgit v1.2.3


From 04eee0ac24de1bf1744ed7a8707a847961fe7192 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 25 Apr 2019 16:07:20 +0300
Subject: SL-11031 [Legacy Profiles] "Drop inventory" field visible for own
 profile

---
 .../default/xui/en/panel_profile_secondlife.xml    | 150 ++++++++++++---------
 1 file changed, 90 insertions(+), 60 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index a5f486d4a1..f7d3353786 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -322,76 +322,106 @@
      name="group_list"
      top_delta="-20"
      left="66"
-     right="-6"
-     height="80"
+     right="-7"
+     height="82"
      follows="left|top|right"
      layout="topleft"
      border_visible="true"
      color="ScrollBgWriteableColor"
      for_agent="false"
     />
-    <text
-     name="About:"
-     value="About:"
-     top_pad="8"
-     left="6"
-     height="16"
-     width="55"
-     follows="left|top"
-     layout="topleft"
-     halign="right"
-    />
-    <text_editor
-     name="sl_description_edit"
-     enabled="false"
-     top_delta="0"
-     left="66"
-     right="-7"
-     height="100"
-     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"
-    />
-    <text
-     name="Give item:"
-     value="Give item:"
-     top_pad="10"
+
+    <layout_stack
+     name="aboutpositioner"
+     top_pad="7"
      left="6"
-     height="16"
-     width="55"
-     follows="left|bottom"
-     layout="topleft"
-     halign="right"
-    />
-    <view_border
-     name="drop_target_rect_vis"
-     top_delta="0"
-     left="66"
      right="-6"
-     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="66"
-     right="-6"
-     height="16"
-     follows="left|bottom|right"
+     height="130"
+     follows="all"
      layout="topleft"
-     halign="center"
+     orientation="vertical"
     >
-        Drop inventory item here.
-    </text>
+      <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"
+         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"
-- 
cgit v1.2.3


From dbe5eb8a1dc18811f945f689f026cdcf180496dd Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 25 Jun 2019 17:54:21 +0300
Subject: SL-11431 [Legacy Profiles] Clicking someone else's profile picture
 should open image modal.

---
 .../default/xui/en/floater_preview_texture.xml     | 208 ++++++++++++---------
 .../default/xui/en/panel_profile_secondlife.xml    |   1 -
 2 files changed, 118 insertions(+), 91 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index f7d3353786..214f89b7af 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -179,7 +179,6 @@
             <!-- 23 pixels (BTN_HEIGHT_SMALL) are reserved by label field of texture and shouldn't be visible-->
             <texture_picker
              name="2nd_life_pic"
-             enabled="false"
              top="0"
              left="0"
              right="-1"
-- 
cgit v1.2.3


From 59a8f73725a23e748d9f54e033735535e617dce7 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 16 Jul 2019 13:43:39 +0300
Subject: SL-11594 FIXED [Viewer Profile Project] 'OK' button does not save
 changes at 'Profile' - 'Classifieds' tab

---
 indra/newview/skins/default/xui/en/panel_profile_classified.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
index 6a0489ae97..7f0f86d524 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -464,6 +464,7 @@
                  font="SansSerif"
                  max_length_bytes="30"
                  prevalidate_callback="ascii"
+                 commit_on_focus_lost="false"
                  text_color="black"
                 />
                 <text
-- 
cgit v1.2.3


From d394f088655188649faef38d04eb6b0069062ed0 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 16 Jul 2019 18:38:26 +0300
Subject: SL-11593 Remove 'Price for listing' from Profile - Classified tab

---
 .../default/xui/en/panel_profile_classified.xml    | 31 +---------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
index 7f0f86d524..741ea49b1e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -619,36 +619,7 @@
                  width="250"
                  layout="topleft"
                 />
-                <text
-                 name="price_for_listing_edit_label"
-                 value="Price for listing:"
-                 top_pad="10"
-                 left="10"
-                 height="10"
-                 width="120"
-                 follows="left|top"
-                 layout="topleft"
-                 text_color="white"
-                />
-                <spinner
-                 name="price_for_listing_edit"
-                 label="L$"
-                 value="50"
-                 tool_tip="Price for listing."
-                 top_delta="0"
-                 left_pad="0"
-                 height="23"
-                 width="105"
-                 follows="left|top"
-                 layout="topleft"
-                 decimal_digits="0"
-                 halign="left"
-                 increment="1"
-                 label_width="20"
-                 max_val="99999"
-                 min_val="50"
-                />
-            </panel>
+              </panel>
         </panel>
     </scroll_container>
     <layout_stack
-- 
cgit v1.2.3


From 36feea560dbef06a32bc4c04a0d61800b7297363 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 13 Aug 2019 17:45:14 +0300
Subject: SL-11721 Mark description fields in legacy profiles as untrusted

---
 indra/newview/skins/default/xui/en/panel_profile_classified.xml | 1 +
 indra/newview/skins/default/xui/en/panel_profile_firstlife.xml  | 1 +
 indra/newview/skins/default/xui/en/panel_profile_pick.xml       | 1 +
 indra/newview/skins/default/xui/en/panel_profile_secondlife.xml | 1 +
 4 files changed, 4 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
index 741ea49b1e..60b13c0bc2 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -409,6 +409,7 @@
                      />
                     <text_editor
                      name="classified_desc"
+                     trusted_content="false"
                      value="[description]"
                      top_pad="7"
                      left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index 2f4656c2a7..7bda6d1718 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -34,6 +34,7 @@
     />
     <text_editor
      name="fl_description_edit"
+     trusted_content="false"
      enabled="false"
      top="225"
      left="6"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_pick.xml b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
index eab62d8211..47d6e9ebbd 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
@@ -36,6 +36,7 @@
     />
     <text_editor
      name="pick_desc"
+     trusted_content="false"
      enabled="false"
      top_pad="8"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 214f89b7af..38e7490864 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -361,6 +361,7 @@
         />
         <text_editor
          name="sl_description_edit"
+         trusted_content="false"
          enabled="false"
          top="0"
          left="60"
-- 
cgit v1.2.3


From 6ef78777660460f994713e596a31f29b62678170 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 17 Sep 2019 12:59:16 +0300
Subject: SL-11965 Rename Web tab to Feed

---
 indra/newview/skins/default/xui/en/floater_profile.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml
index 865855a749..6834a4bd1b 100644
--- a/indra/newview/skins/default/xui/en/floater_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile.xml
@@ -44,7 +44,7 @@
             />
             <panel
              name="panel_profile_web"
-             label="Web"
+             label="Feed"
              layout="topleft"
              class="panel_profile_web"
              filename="panel_profile_web.xml"
-- 
cgit v1.2.3


From b00d6c025cad138003f933e037d8a434cbf29c4d Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 5 Nov 2019 19:11:06 +0200
Subject: SL-11959 Some of the missing tooltips

---
 indra/newview/skins/default/xui/en/floater_profile.xml           | 1 +
 indra/newview/skins/default/xui/en/panel_profile_classifieds.xml | 2 ++
 indra/newview/skins/default/xui/en/panel_profile_picks.xml       | 2 ++
 indra/newview/skins/default/xui/en/panel_profile_secondlife.xml  | 2 ++
 4 files changed, 7 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml
index 6834a4bd1b..1b56f65cc0 100644
--- a/indra/newview/skins/default/xui/en/floater_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile.xml
@@ -106,6 +106,7 @@
         <button
          name="cancel_btn"
          label="Cancel"
+         tool_tip="Discard unsaved changes and close"
          bottom_delta="0"
          right="-10"
          height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
index fc6b92ed2f..ff27113d53 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
@@ -26,6 +26,7 @@
     <button
      name="new_btn"
      label="New..."
+     tool_tip="Create a new classified at the current location"
      enabled="false"
      top="25"
      left="5"
@@ -38,6 +39,7 @@
     <button
      name="delete_btn"
      label="Delete..."
+     tool_tip="Delete currently selected classified"
      enabled="false"
      left_pad="5"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_picks.xml b/indra/newview/skins/default/xui/en/panel_profile_picks.xml
index dc6265b791..56a48572d3 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_picks.xml
@@ -38,6 +38,7 @@
     <button
      name="new_btn"
      label="New..."
+     tool_tip="Create a new pick at the current location"
      enabled="false"
      top_pad="4"
      left="5"
@@ -50,6 +51,7 @@
     <button
      name="delete_btn"
      label="Delete..."
+     tool_tip="Delete currently selected pick"
      enabled="false"
      left_pad="5"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 38e7490864..9862403068 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -143,6 +143,7 @@
       <!--mouse_opaque="true"-->
       <menu_button
        name="copy_btn"
+       tool_tip="Copy options"
        height="16"
        right="-2"
        top="2"
@@ -535,6 +536,7 @@
     <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"
-- 
cgit v1.2.3


From 3d5ffd0af31bb59a839ea6b0d84a2fa11eee734c Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 2 Dec 2019 16:28:13 +0200
Subject: SL-12003 FIXED Viewer Icons do not display in Profiles

---
 indra/newview/skins/default/xui/en/panel_profile_pick.xml       | 1 +
 indra/newview/skins/default/xui/en/panel_profile_secondlife.xml | 1 +
 2 files changed, 2 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_pick.xml b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
index 47d6e9ebbd..0417df43c9 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
@@ -37,6 +37,7 @@
     <text_editor
      name="pick_desc"
      trusted_content="false"
+     always_show_icons="true"
      enabled="false"
      top_pad="8"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 9862403068..1b038196ef 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -363,6 +363,7 @@
         <text_editor
          name="sl_description_edit"
          trusted_content="false"
+         always_show_icons="true"
          enabled="false"
          top="0"
          left="60"
-- 
cgit v1.2.3


From 39805cd97882ffb0f93a7d4fb07a6445327ef6cf Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 2 Dec 2019 16:28:49 +0200
Subject: SL-12341 FIXED The profile popup when hovering over a person's name
 in-world allows SLURLs to be executed

---
 indra/newview/skins/default/xui/en/inspect_avatar.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

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"
-- 
cgit v1.2.3


From ad1052039cfdd0e9a95304874cf1347e1472d36f Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Wed, 5 Feb 2020 19:33:36 +0200
Subject: SL-12550 Profile feed tab cleanup

SL-12550 Profile feed tab cleanup
---
 .../skins/default/xui/en/panel_profile_web.xml     | 59 +---------------------
 1 file changed, 1 insertion(+), 58 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_web.xml b/indra/newview/skins/default/xui/en/panel_profile_web.xml
index 97e245dc24..af2ac57f58 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_web.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_web.xml
@@ -13,66 +13,9 @@
      name="LoadTime"
      value="Load Time: [TIME] seconds"
     />
-    <line_editor
-     name="url_edit"
-     enabled="false"
-     top_pad="5"
-     left="10"
-     height="16"
-     width="400"
-     follows="left|top"
-     layout="topleft"
-     text_pad_left="4"
-     max_length_bytes="254"
-    >
-        (loading..)
-    </line_editor>
-    <flyout_button
-     name="load"
-     label="Load"
-     tool_tip="Load this profile page with embedded web browser."
-     enabled="false"
-     top_pad="5"
-     left="10"
-     height="18"
-     width="80"
-     follows="left|top"
-     layout="topleft"
-    >
-        <flyout_button.item
-         name="open_item"
-         label="Open in-viewer browser"
-         value="popout"
-        />
-        <flyout_button.item
-         name="home_item"
-         label="Open external browser"
-         value="external"
-        />
-    </flyout_button>
-    <loading_indicator
-     name="progress_indicator"
-     left_pad="100"
-     height="23"
-     width="23"
-     follows="top|left"
-     layout="topleft"
-     visible="false"
-    />
-    <button
-     name="web_profile_popout_btn"
-     top_delta="5"
-     right="-10"
-     height="16"
-     width="16"
-     follows="right|top"
-     layout="topleft"
-     image_overlay="tearoffbox.tga"
-     tool_tip="Popout web profile"
-    />
     <web_browser
      name="profile_html"
-     top="48"
+     top="10"
      bottom="-18"
      left="10"
      right="-10"
-- 
cgit v1.2.3


From e1a3ce0d7465fd1c441168b0fcf5b849f47bab4e Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Sat, 11 Jul 2020 04:35:34 +0300
Subject: SL-13556 The browser status label shouldn't be clickable

---
 indra/newview/skins/default/xui/en/panel_profile_web.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_web.xml b/indra/newview/skins/default/xui/en/panel_profile_web.xml
index af2ac57f58..e0cb4d3d06 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_web.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_web.xml
@@ -31,5 +31,6 @@
      follows="bottom|left|right"
      layout="topleft"
      halign="center"
+     parse_urls="false"
     />
 </panel>
-- 
cgit v1.2.3


From 2d113743f2943a1ab614a41d29cef7e13bc4e878 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 14 Jan 2021 18:02:09 +0200
Subject: SL-14504 FIXED Classified links always launch your Profile
 Classifieds

---
 .../newview/skins/default/xui/en/floater_picks.xml | 21 ++++++++++++
 .../skins/default/xui/en/panel_classified_info.xml | 37 ++--------------------
 2 files changed, 24 insertions(+), 34 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_picks.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_picks.xml b/indra/newview/skins/default/xui/en/floater_picks.xml
new file mode 100644
index 0000000000..3cd6abafe5
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_picks.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ positioning="cascading"
+ can_close="true"
+ can_resize="false"
+ height="572"
+ help_topic="sidebar_me"
+ min_width="333"
+ min_height="440"
+ name="floater_picks"
+ save_rect="true"
+ save_visibility="false"
+ reuse_instance="true"
+ title="Picks"
+ width="333" >
+   <panel
+    class="panel_classified_info"
+    name="main_panel"
+    filename="panel_classified_info.xml"
+    follows="all"/>
+</floater>
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>
-- 
cgit v1.2.3


From 1d0f25714e17d1f65ee7ef4c9394fed9210e3cd4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 28 Jan 2021 21:54:52 +0200
Subject: SL-14486 Avoid accidental truncation of avatar notes field

Server sided limitation, web page allows more than server sends to viewer. This is a workaround untill server sided restriction gets lifted.
---
 .../skins/default/xui/en/panel_profile_notes.xml   | 24 ++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_notes.xml b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
index 0bafaac361..179fa0136c 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
@@ -9,6 +9,14 @@
  follows="all"
  layout="topleft"
 >
+    <!--these strings will be combined into one with different styles-->
+    <string name="header_symbol_limit">
+Warning: Your notes contain more than 1000 characters.
+    </string>
+    <string name="body_symbol_limit">
+Only first 1000 characters are shown here. If you edit your notes and click OK, the extra characters will be lost. To preserve the extra characters, you must edit it [[PROFILE_URL] on the web]
+    </string>
+
     <loading_indicator
      name="progress_indicator"
      top="3"
@@ -36,16 +44,27 @@
      top_pad="4"
      left="6"
      right="-6"
-     height="335"
+     height="311"
      follows="all"
      layout="topleft"
      max_length="1000"
      word_wrap="true"
     />
+    <text
+     layout="topleft"
+     follows="left|bottom|right"
+     top_pad="2"
+     left="6"
+     right="-6"
+     height ="28"
+     name="character_limit_warning"
+     word_wrap="true">
+      Placeholder: Your notes contain more than 1000 characters. Only first 1000 characters are shown here. If you edit your notes and click OK, the extra characters will be lost. To preserve the extra characters, you must edit it [https://my.secondlife.com/settings/profile on the web]
+    </text>
     <text
      name="status_message2"
      value="Allow this avatar to:"
-     top_pad="8"
+     top_pad="11"
      left="6"
      right="-6"
      height="16"
@@ -57,6 +76,7 @@
      name="status_check"
      label="See when I am online"
      enabled="false"
+     top_pad="0"
      left="10"
      height="16"
      width="293"
-- 
cgit v1.2.3


From 259c5e3ffe101f75775a9e574e5436b434af58c1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 12 Mar 2022 00:04:18 +0200
Subject: SL-16937 New Profile capability, PUT method #2

---
 indra/newview/skins/default/xui/en/panel_profile_notes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_notes.xml b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
index 179fa0136c..a83635f954 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
@@ -47,7 +47,7 @@ Only first 1000 characters are shown here. If you edit your notes and click OK,
      height="311"
      follows="all"
      layout="topleft"
-     max_length="1000"
+     max_length="65530"
      word_wrap="true"
     />
     <text
-- 
cgit v1.2.3


From cf15fa72f719a50e008d4310c93ee17643db3313 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 15 Mar 2022 15:50:36 +0200
Subject: SL-16937 New Profile capability, cap updates #3

---
 .../skins/default/xui/en/panel_edit_profile.xml       |  4 ++--
 .../skins/default/xui/en/panel_profile_firstlife.xml  |  2 +-
 .../skins/default/xui/en/panel_profile_notes.xml      | 19 -------------------
 .../skins/default/xui/en/panel_profile_secondlife.xml |  2 +-
 4 files changed, 4 insertions(+), 23 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 2c7c8133d1..3680759536 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -245,7 +245,7 @@
        layout="topleft"
        left="123"
        top="90"
-       max_length="512"
+       max_length="65000"
        name="sl_description_edit"
        width="157"
        word_wrap="true">
@@ -300,7 +300,7 @@
        height="102"
        layout="topleft"
        left="123"
-       max_length="512"
+       max_length="65000"
        top="223"
        name="fl_description_edit"
        width="157"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index 7bda6d1718..108eb9443d 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -44,7 +44,7 @@
      layout="topleft"
      bg_readonly_color="Transparent"
      border_visible="true"
-     max_length="253"
+     max_length="65000"
      parse_urls="true"
      word_wrap="true"
     />
diff --git a/indra/newview/skins/default/xui/en/panel_profile_notes.xml b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
index a83635f954..c7dfaa1e67 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
@@ -9,14 +9,6 @@
  follows="all"
  layout="topleft"
 >
-    <!--these strings will be combined into one with different styles-->
-    <string name="header_symbol_limit">
-Warning: Your notes contain more than 1000 characters.
-    </string>
-    <string name="body_symbol_limit">
-Only first 1000 characters are shown here. If you edit your notes and click OK, the extra characters will be lost. To preserve the extra characters, you must edit it [[PROFILE_URL] on the web]
-    </string>
-
     <loading_indicator
      name="progress_indicator"
      top="3"
@@ -50,17 +42,6 @@ Only first 1000 characters are shown here. If you edit your notes and click OK,
      max_length="65530"
      word_wrap="true"
     />
-    <text
-     layout="topleft"
-     follows="left|bottom|right"
-     top_pad="2"
-     left="6"
-     right="-6"
-     height ="28"
-     name="character_limit_warning"
-     word_wrap="true">
-      Placeholder: Your notes contain more than 1000 characters. Only first 1000 characters are shown here. If you edit your notes and click OK, the extra characters will be lost. To preserve the extra characters, you must edit it [https://my.secondlife.com/settings/profile on the web]
-    </text>
     <text
      name="status_message2"
      value="Allow this avatar to:"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 1b038196ef..816b0b8f5c 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -375,7 +375,7 @@
          border_visible="true"
          font="SansSerifSmall"
          h_pad="2"
-         max_length="510"
+         max_length="65000"
          parse_urls="true"
          word_wrap="true"
         />
-- 
cgit v1.2.3


From cd61dbe6eea8d9a7e4bdb594179bafc24a504146 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 29 Mar 2022 10:57:29 +0300
Subject: SL-17084 Remove 'interests' tab

'Legacy interests' are obsolete
---
 .../skins/default/xui/en/floater_profile.xml       |   8 -
 .../default/xui/en/panel_profile_interests.xml     | 250 ---------------------
 2 files changed, 258 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/panel_profile_interests.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml
index 1b56f65cc0..dede8bc0a6 100644
--- a/indra/newview/skins/default/xui/en/floater_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile.xml
@@ -50,14 +50,6 @@
              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"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_interests.xml b/indra/newview/skins/default/xui/en/panel_profile_interests.xml
deleted file mode 100644
index 0359b0bc4b..0000000000
--- a/indra/newview/skins/default/xui/en/panel_profile_interests.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?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>
-- 
cgit v1.2.3


From 8f6d149fadf635f6698e2e68aa4f48db13eff648 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 30 Mar 2022 18:32:42 +0300
Subject: SL-16937 New Profile capability, image uploader for testing

This commit is mostly to simplify cap testing for server side. Plan is to remove LLLocalBitmap and draw texture more directly instead
---
 .../skins/default/xui/en/panel_profile_secondlife.xml   | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 816b0b8f5c..d8d2749a2b 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -177,19 +177,16 @@
          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
+
+            <icon
              name="2nd_life_pic"
+             image_name="Generic_Person_Large"
+             layout="topleft"
+             follows="all"
              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"
-             />
+             width="157"
+             height="157"/>
         </layout_panel>
         <layout_panel
          name="label_stack"
-- 
cgit v1.2.3


From 8163eeb43bdfa806c306ba5caf2457c59efed2d4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 6 Apr 2022 22:16:39 +0300
Subject: SL-15312 Legacy profiles remake #1

Initial layout
---
 .../skins/default/xui/en/floater_profile.xml       |  27 +-
 .../skins/default/xui/en/panel_edit_profile.xml    | 472 ------------
 .../default/xui/en/panel_profile_secondlife.xml    | 827 ++++++++-------------
 3 files changed, 327 insertions(+), 999 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/panel_edit_profile.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml
index dede8bc0a6..92207cdc36 100644
--- a/indra/newview/skins/default/xui/en/floater_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile.xml
@@ -36,7 +36,7 @@
         >
             <panel
              name="panel_profile_secondlife"
-             label="Second Life"
+             label="BIO"
              layout="topleft"
              class="panel_profile_secondlife"
              filename="panel_profile_secondlife.xml"
@@ -83,30 +83,5 @@
              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/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
deleted file mode 100644
index 3680759536..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="65000"
-       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="65000"
-       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_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index d8d2749a2b..fe1244aaf3 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -9,549 +9,374 @@
  follows="all"
  layout="topleft"
 >
-    <string
-     name="status_online"
-    >
-        Currently Online
-    </string>
-    <string
-     name="status_offline"
-    >
-        Currently Offline
-    </string>
-    <string
-     name="CaptionTextAcctInfo"
-    >
-       [ACCTTYPE]
+   <string 
+    name="AgeFormat"
+    value="[AGE]" />
+   <string
+    name="no_partner_text"
+    value="None" />
+   <string
+    name="CaptionTextAcctInfo">
+Account: [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_stack
+   name="main_stack"
+   top="8"
+   left="6"
+   right="-1"
+   bottom="-1"
+   follows="all"
+   layout="topleft"
+   orientation="vertical">
+
+    <layout_panel
+     name="name_details_image"
+     follows="all"
      layout="topleft"
-     allow_scroll="false"
-     bg_visible="false"
-     border_visible="false">
-      <text_editor
-       name="complete_name"
-       value="(loading...)"
-       enabled="false"
+     height="160"
+     auto_resize="false"
+     user_resize="false">
+
+      <layout_stack
+       name="name_details_image_stack"
        top="0"
        left="0"
        right="-1"
-       height="20"
-       follows="left|top|right"
+       bottom="-1"
+       follows="all"
        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"
-    >
+       orientation="horizontal">
+
         <layout_panel
-         name="image_stack"
+         name="image_panel"
          follows="all"
          layout="topleft"
-         width="158"
-         height="158"
+         width="160"
          auto_resize="false"
-         user_resize="false"
-        >
+         user_resize="false">
 
-            <icon
-             name="2nd_life_pic"
-             image_name="Generic_Person_Large"
-             layout="topleft"
-             follows="all"
-             top="0"
-             left="0"
-             width="157"
-             height="157"/>
+          <icon
+           name="2nd_life_pic"
+           image_name="Generic_Person_Large"
+           layout="topleft"
+           follows="all"
+           top="0"
+           left="2"
+           bottom="-1"
+           right="-1"/>
+          
         </layout_panel>
         <layout_panel
-         name="label_stack"
+         name="details_panel"
          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"
-             />
+          <text
+           name="display_name"
+           value="(loading...)"
+           top="0"
+           left="2"
+           right="-1"
+           height="20"
+           follows="left|top|right"
+           layout="topleft"/>
+          
+          <text
+           name="user_name"
+           value="(loading...)"
+           top_pad="3"
+           left="2"
+           right="-1"
+           height="20"
+           follows="left|top|right"
+           layout="topleft"/>
+
+          <text
+           name="user_age"
+           value="(loading...)"
+           top_pad="3"
+           left="2"
+           right="-1"
+           height="20"
+           follows="left|top|right"
+           layout="topleft"/>
+
+          <text
+           name="partner_link"
+           value="Partner: (loading...)"
+           top_pad="3"
+           left="2"
+           right="-1"
+           height="20"
+           follows="left|top|right"
+           layout="topleft"/>
+
+          <text
+           name="account_info"
+           value="Account: (loading...)"
+           top_pad="3"
+           left="2"
+           right="-1"
+           height="20"
+           follows="left|top|right"
+           layout="topleft"/>
+
+          <menu_button
+           layout="topleft"
+           follows="left|bottom"
+           left="2"
+           bottom="-1"
+           height="25"
+           width="120"
+           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" />
         </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_panel
+         name="permissions_panel"
+         follows="all"
+         layout="topleft"
+         width="26"
+         auto_resize="false"
+         user_resize="false">
+          <!--Probably should be borderless buttons-->
+          <icon
+           name="allow_to_see_online"
+           image_name="Generic_Person_Large"
+           layout="topleft"
+           follows="left|top"
+           top="0"
+           left="0"
+           width="24"
+           height="24"/>
+          <icon
+           name="allow_to_see_on_map"
+           image_name="Generic_Person_Large"
+           layout="topleft"
+           follows="left|top"
+           top_pad="7"
+           left="0"
+           width="24"
+           height="24"/>
+          <icon
+           name="allow_edit_my_objects"
+           image_name="Generic_Person_Large"
+           layout="topleft"
+           follows="left|top"
+           top_pad="7"
+           left="0"
+           width="24"
+           height="24"/>
+        
+        </layout_panel>
+      </layout_stack>
+
+    </layout_panel>
 
-    <layout_stack
-     name="aboutpositioner"
-     top_pad="7"
-     left="6"
-     right="-6"
-     height="130"
+    <layout_panel
+     name="about_panel"
      follows="all"
      layout="topleft"
-     orientation="vertical"
-    >
-      <layout_panel
-       name="about_stack"
+     height="159"
+     auto_resize="true"
+     user_resize="false">
+      <text_editor
+       name="sl_description_edit"
+       trusted_content="false"
+       always_show_icons="true"
+       enabled="false"
+       top="1"
+       left="1"
+       right="-1"
+       bottom="-1"
        follows="all"
        layout="topleft"
-       left="0"
-       height="105"
-       auto_resize="true"
-       user_resize="false">
-        <text
-         name="About:"
-         value="About:"
+       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"
-         left="0"
-         height="16"
-         width="55"
-         follows="left|top"
+         right="-105"
+         height="20"
+         width="80"
+         follows="top|right"
          layout="topleft"
-         halign="right"
-        />
-        <text_editor
-         name="sl_description_edit"
-         trusted_content="false"
-         always_show_icons="true"
-         enabled="false"
-         top="0"
-         left="60"
+         label_selected="Find on Map"/>
+        <button
+         name="discard_description_changes"
+         label="Discard"
+         top="1"
          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="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"
+         height="20"
+         width="100"
+         follows="top|right"
          layout="topleft"
-         halign="right"
-        />
+         label_selected="Find on Map"/>
         <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"
+         bevel_style="none"
+         height="0"
          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"
+         left="0"
+         name="cost_text_border"
+         top_pad="9"
+         width="492"/>
+    </layout_panel>
+    <layout_panel
+     name="groups_notes_settings"
+     follows="all"
      layout="topleft"
-     orientation="horizontal"
-    >
+     height="159"
+     auto_resize="true"
+     user_resize="false">
+
+      <layout_stack
+       name="groups_notes_settings_stack"
+       top="1"
+       left="1"
+       right="-1"
+       bottom="-1"
+       follows="all"
+       layout="topleft"
+       orientation="horizontal">
         <layout_panel
-         name="left_buttonstack"
-         left="2"
-         right="-2"
-         height="42"
+         name="groups_panel"
          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"
-            />
+         width="200"
+         auto_resize="true"
+         user_resize="false">
+          <text
+           name="group_label"
+           value="(loading...) is a member of:"
+           top="1"
+           left="1"
+           right="-1"
+           height="16"
+           follows="left|top|right"
+           layout="topleft"/>
+          <group_list
+           name="group_list"
+           top_pad="1"
+           left="1"
+           right="-1"
+           bottom="-1"
+           follows="all"
+           layout="topleft"
+           border_visible="true"
+           color="ScrollBgWriteableColor"
+           for_agent="false"/>
+          
         </layout_panel>
+        
         <layout_panel
-         name="middle_buttonstack"
-         left="2"
-         right="-2"
+         name="notes_panel"
          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"
-            />
+         width="200"
+         auto_resize="true"
+         user_resize="false">
+          <!-- notes are only for other agents -->
+        
+          <text
+           name="notes_label"
+           value="My private notes:"
+           top="1"
+           left="1"
+           right="-1"
+           height="16"
+           follows="left|top|right"
+           layout="topleft"/>
+          <text_editor
+           name="notes_edit"
+           trusted_content="false"
+           always_show_icons="true"
+           enabled="false"
+           top_pad="1"
+           left="1"
+           right="-1"
+           bottom="-27"
+           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"/>         
+          <button
+           name="save_notes_changes"
+           label="Save"
+           bottom="-1"
+           right="-105"
+           height="20"
+           width="80"
+           follows="bottom|right"
+           layout="topleft"
+           label_selected="Find on Map"/>
+          <button
+           name="discard_notes_changes"
+           label="Discard"
+           bottom="-1"
+           right="-1"
+           height="20"
+           width="100"
+           follows="bottom|right"
+           layout="topleft"
+           label_selected="Find on Map"/>
         </layout_panel>
+
         <layout_panel
-         name="right_buttonstack"
-         left="2"
-         right="-2"
+         name="settings_panel"
          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"
-            />
+         width="200"
+         auto_resize="true"
+         user_resize="false">
+          <!-- settings will be here -->
+          <check_box
+           name="show_in_search_checkbox"
+           label="Show in search"
+           tool_tip="Let people see you in search results"
+           left="1"
+           top="1"
+           height="16"
+           width="130"
+           follows="left|top"
+           layout="topleft"
+           visible="true"
+           enabled="false"/>
         </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"
-    />
+
+
+      </layout_stack>
+      
+    </layout_panel>
+  </layout_stack>
+  
 </panel>
-- 
cgit v1.2.3


From 2f776a38af873163d6b5d5e030ce4b57a3e10e93 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 8 Apr 2022 00:18:22 +0300
Subject: SL-15312 Legacy profiles remake #2

---
 .../skins/default/xui/en/menu_name_field.xml       |  22 ----
 .../skins/default/xui/en/menu_profile_other.xml    | 129 +++++++++++++++++++++
 .../default/xui/en/panel_profile_secondlife.xml    |  57 ++++-----
 3 files changed, 151 insertions(+), 57 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/menu_name_field.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_profile_other.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_name_field.xml b/indra/newview/skins/default/xui/en/menu_name_field.xml
deleted file mode 100644
index 3c5e5dd353..0000000000
--- a/indra/newview/skins/default/xui/en/menu_name_field.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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_profile_other.xml b/indra/newview/skins/default/xui/en/menu_profile_other.xml
new file mode 100644
index 0000000000..5fc625b8e5
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_profile_other.xml
@@ -0,0 +1,129 @@
+<?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="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>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index fe1244aaf3..4b40db9b5d 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -14,7 +14,10 @@
     value="[AGE]" />
    <string
     name="no_partner_text"
-    value="None" />
+    value="Partner: None" />
+   <string
+    name="partner_text"
+    value="Partner: [LINK]" />
    <string
     name="CaptionTextAcctInfo">
 Account: [ACCTTYPE]
@@ -78,6 +81,7 @@ Account: [ACCTTYPE]
           <text
            name="display_name"
            value="(loading...)"
+           font="SansSerifBigLarge"
            top="0"
            left="2"
            right="-1"
@@ -88,40 +92,43 @@ Account: [ACCTTYPE]
           <text
            name="user_name"
            value="(loading...)"
-           top_pad="3"
+           top_pad="0"
            left="2"
            right="-1"
-           height="20"
+           height="16"
            follows="left|top|right"
            layout="topleft"/>
 
           <text
            name="user_age"
            value="(loading...)"
-           top_pad="3"
+           top_pad="0"
            left="2"
            right="-1"
-           height="20"
+           height="16"
            follows="left|top|right"
            layout="topleft"/>
 
           <text
+           type="string"
            name="partner_link"
            value="Partner: (loading...)"
-           top_pad="3"
+           top_pad="0"
            left="2"
            right="-1"
-           height="20"
+           height="16"
            follows="left|top|right"
-           layout="topleft"/>
+           layout="topleft"
+           translate="false"
+           use_ellipses="true" />
 
           <text
            name="account_info"
            value="Account: (loading...)"
-           top_pad="3"
+           top_pad="0"
            left="2"
            right="-1"
-           height="20"
+           height="16"
            follows="left|top|right"
            layout="topleft"/>
 
@@ -139,7 +146,7 @@ Account: [ACCTTYPE]
            image_pressed="DropDown_Press" 
            image_pressed_selected="DropDown_Press"
            image_disabled="DropDown_Disabled"
-           name="agent_actions" />
+           name="agent_actions_menu" />
         </layout_panel>
         
         <layout_panel
@@ -149,6 +156,7 @@ Account: [ACCTTYPE]
          width="26"
          auto_resize="false"
          user_resize="false">
+          <!--Todo: progress indicator-->
           <!--Probably should be borderless buttons-->
           <icon
            name="allow_to_see_online"
@@ -272,7 +280,7 @@ Account: [ACCTTYPE]
          user_resize="false">
           <text
            name="group_label"
-           value="(loading...) is a member of:"
+           value="Group membership"
            top="1"
            left="1"
            right="-1"
@@ -300,8 +308,7 @@ Account: [ACCTTYPE]
          width="200"
          auto_resize="true"
          user_resize="false">
-          <!-- notes are only for other agents -->
-        
+          <!-- notes are only for other agents -->        
           <text
            name="notes_label"
            value="My private notes:"
@@ -328,27 +335,7 @@ Account: [ACCTTYPE]
            h_pad="2"
            max_length="65000"
            parse_urls="true"
-           word_wrap="true"/>         
-          <button
-           name="save_notes_changes"
-           label="Save"
-           bottom="-1"
-           right="-105"
-           height="20"
-           width="80"
-           follows="bottom|right"
-           layout="topleft"
-           label_selected="Find on Map"/>
-          <button
-           name="discard_notes_changes"
-           label="Discard"
-           bottom="-1"
-           right="-1"
-           height="20"
-           width="100"
-           follows="bottom|right"
-           layout="topleft"
-           label_selected="Find on Map"/>
+           word_wrap="true"/>
         </layout_panel>
 
         <layout_panel
-- 
cgit v1.2.3


From 285e36b57ea895f660f06095652b8cf03b7cbc09 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 9 Apr 2022 00:57:19 +0300
Subject: SL-15312 Legacy profiles remake #3

---
 .../skins/default/xui/en/menu_profile_other.xml    | 31 +++++++++
 .../skins/default/xui/en/menu_profile_self.xml     | 74 ++++++++++++++++++++++
 .../default/xui/en/panel_profile_secondlife.xml    |  4 +-
 3 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_profile_self.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_profile_other.xml b/indra/newview/skins/default/xui/en/menu_profile_other.xml
index 5fc625b8e5..7731ee65d1 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_other.xml
@@ -126,4 +126,35 @@
      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..552c96c60c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_profile_self.xml
@@ -0,0 +1,74 @@
+<?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="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/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 4b40db9b5d..3ed704b090 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -264,10 +264,10 @@ Account: [ACCTTYPE]
 
       <layout_stack
        name="groups_notes_settings_stack"
-       top="1"
+       top="0"
        left="1"
        right="-1"
-       bottom="-1"
+       height="159"
        follows="all"
        layout="topleft"
        orientation="horizontal">
-- 
cgit v1.2.3


From f42dba8d928da51ee93eae4e15b64280bfcf7ffd Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 12 Apr 2022 00:41:40 +0300
Subject: SL-15312 Legacy profiles remake #4

---
 .../default/xui/en/panel_profile_firstlife.xml     | 42 ++++++++++++++++++++--
 .../default/xui/en/panel_profile_secondlife.xml    | 17 +++++----
 2 files changed, 50 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index 108eb9443d..70063e8fc9 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -32,14 +32,32 @@
      default_image_name="None"
      fallback_image="Generic_Person_Large"
     />
+    <button
+     name="fl_upload_image"
+     label="Change Photo"
+     top="167"
+     left_pad="5"
+     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="225"
+     top="220"
      left="6"
-     right="-7"
-     height="183"
+     right="-6"
+     height="230"
      follows="all"
      layout="topleft"
      bg_readonly_color="Transparent"
@@ -48,4 +66,22 @@
      parse_urls="true"
      word_wrap="true"
     />
+    <button
+     name="fl_save_changes"
+     label="Save"
+     top="429"
+     right="-108"
+     height="20"
+     width="80"
+     follows="top|right"
+     layout="topleft"/>
+    <button
+     name="fl_discard_changes"
+     label="Discard"
+     top_delta="0"
+     right="-4"
+     height="20"
+     width="100"
+     follows="top|right"
+     layout="topleft"/>
 </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
index 3ed704b090..3aa4b47612 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -32,6 +32,7 @@ Account: [ACCTTYPE]
    bottom="-1"
    follows="all"
    layout="topleft"
+   animate="false"
    orientation="vertical">
 
     <layout_panel
@@ -50,6 +51,7 @@ Account: [ACCTTYPE]
        bottom="-1"
        follows="all"
        layout="topleft"
+       animate="false"
        orientation="horizontal">
 
         <layout_panel
@@ -202,6 +204,7 @@ Account: [ACCTTYPE]
        name="sl_description_edit"
        trusted_content="false"
        always_show_icons="true"
+       commit_on_focus_lost="false"
        enabled="false"
        top="1"
        left="1"
@@ -232,9 +235,9 @@ Account: [ACCTTYPE]
          right="-105"
          height="20"
          width="80"
+         enabled="false"
          follows="top|right"
-         layout="topleft"
-         label_selected="Find on Map"/>
+         layout="topleft"/>
         <button
          name="discard_description_changes"
          label="Discard"
@@ -242,9 +245,9 @@ Account: [ACCTTYPE]
          right="-1"
          height="20"
          width="100"
+         enabled="false"
          follows="top|right"
-         layout="topleft"
-         label_selected="Find on Map"/>
+         layout="topleft"/>
         <view_border
          bevel_style="none"
          height="0"
@@ -270,12 +273,14 @@ Account: [ACCTTYPE]
        height="159"
        follows="all"
        layout="topleft"
+       animate="false"
        orientation="horizontal">
         <layout_panel
          name="groups_panel"
          follows="all"
          layout="topleft"
          width="200"
+         height="159"
          auto_resize="true"
          user_resize="false">
           <text
@@ -289,7 +294,7 @@ Account: [ACCTTYPE]
            layout="topleft"/>
           <group_list
            name="group_list"
-           top_pad="1"
+           top="18"
            left="1"
            right="-1"
            bottom="-1"
@@ -319,7 +324,7 @@ Account: [ACCTTYPE]
            follows="left|top|right"
            layout="topleft"/>
           <text_editor
-           name="notes_edit"
+           name="notes_snippet"
            trusted_content="false"
            always_show_icons="true"
            enabled="false"
-- 
cgit v1.2.3


From 1483c05c9f61e7ce44e8883d8e10d976867882fa Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 12 Apr 2022 21:46:53 +0300
Subject: SL-15312 Legacy profiles remake #5

Mostly changes for notes tab and first life tab
---
 .../default/xui/en/panel_profile_firstlife.xml      | 20 +++++++++-----------
 .../skins/default/xui/en/panel_profile_notes.xml    | 21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index 70063e8fc9..e656fd7b07 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -19,19 +19,15 @@
      layout="topleft"
      visible="false"
     />
-    <texture_picker
+    <icon
      name="real_world_pic"
-     enabled="false"
-     top="10"
-     left="6"
-     height="225"
-     width="202"
+     image_name="Generic_Person_Large"
      follows="top|left"
      layout="topleft"
-     allow_no_texture="true"
-     default_image_name="None"
-     fallback_image="Generic_Person_Large"
-    />
+     top="10"
+     left="8"
+     height="202"
+     width="202"/>
     <button
      name="fl_upload_image"
      label="Change Photo"
@@ -57,7 +53,7 @@
      top="220"
      left="6"
      right="-6"
-     height="230"
+     height="224"
      follows="all"
      layout="topleft"
      bg_readonly_color="Transparent"
@@ -73,6 +69,7 @@
      right="-108"
      height="20"
      width="80"
+     enabled="false"
      follows="top|right"
      layout="topleft"/>
     <button
@@ -82,6 +79,7 @@
      right="-4"
      height="20"
      width="100"
+     enabled="false"
      follows="top|right"
      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
index c7dfaa1e67..2d9d513ce0 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
@@ -42,6 +42,7 @@
      max_length="65530"
      word_wrap="true"
     />
+  <!--Placeholder, will be moved into BIO's clickable icons-->
     <text
      name="status_message2"
      value="Allow this avatar to:"
@@ -84,4 +85,24 @@
      follows="left|bottom|right"
      layout="topleft"
     />
+    <button
+     name="notes_save_changes"
+     label="Save"
+     top="429"
+     right="-108"
+     height="20"
+     width="80"
+     enabled="false"
+     follows="top|right"
+     layout="topleft"/>
+    <button
+     name="notes_discard_changes"
+     label="Discard"
+     top_delta="0"
+     right="-4"
+     height="20"
+     width="100"
+     enabled="false"
+     follows="top|right"
+     layout="topleft"/>
 </panel>
-- 
cgit v1.2.3


From 4f38a63b076044e9578a91b769a4e1856241f2ba Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 13 Apr 2022 23:38:02 +0300
Subject: SL-15312 Legacy profiles remake #6

---
 .../skins/default/xui/en/floater_display_name.xml  | 11 +---
 .../default/xui/en/floater_profile_permissions.xml | 73 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_profile_notes.xml   | 43 -------------
 .../default/xui/en/panel_profile_secondlife.xml    | 26 +++++---
 4 files changed, 93 insertions(+), 60 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_profile_permissions.xml

(limited to 'indra/newview/skins/default/xui/en')

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..d14b4a1699 100644
--- a/indra/newview/skins/default/xui/en/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/en/floater_display_name.xml
@@ -83,21 +83,12 @@
      tool_tip="Save your new Display Name" 
      top_pad="40"
      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_profile_permissions.xml b/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
new file mode 100644
index 0000000000..d186146770
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
@@ -0,0 +1,73 @@
+<?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="200"
+ layout="topleft"
+ name="profile_permissiona"
+ width="300">
+  <text
+   name="perm_description"
+   value="Allow [AGENT_NAME] to:"
+   top="5"
+   left="6"
+   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="10"
+   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="10"
+   height="16"
+   width="293"
+   follows="top|left"
+   layout="topleft"
+    />
+  <check_box
+   name="objects_check"
+   label="Edit, delete or take my objects"
+   top_pad="5"
+   left="10"
+   height="16"
+   width="293"
+   follows="top|left"
+   layout="topleft"
+    />
+  <button
+   name="perms_btn_ok"
+   label="OK"
+   top_pad="5"
+   left="10"
+   height="20"
+   width="90"
+   follows="top|left"
+   layout="topleft"/>
+  <button
+   name="perms_btn_cancel"
+   label="Cancel"
+   top_delta="0"
+   left_pad="10"
+   height="20"
+   width="90"
+   follows="top|left"
+   layout="topleft"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_notes.xml b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
index 2d9d513ce0..78d5fb5915 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
@@ -42,49 +42,6 @@
      max_length="65530"
      word_wrap="true"
     />
-  <!--Placeholder, will be moved into BIO's clickable icons-->
-    <text
-     name="status_message2"
-     value="Allow this avatar to:"
-     top_pad="11"
-     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"
-     top_pad="0"
-     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"
-    />
     <button
      name="notes_save_changes"
      label="Save"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 3aa4b47612..5dd4a9116a 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -159,28 +159,40 @@ Account: [ACCTTYPE]
          auto_resize="false"
          user_resize="false">
           <!--Todo: progress indicator-->
-          <!--Probably should be borderless buttons-->
-          <icon
+          <!--Todo: Waits for icons. Current behavior is suboptimal and is a placeholder-->
+
+          <button
            name="allow_to_see_online"
-           image_name="Generic_Person_Large"
+           image_hover_unselected="Toolbar_Middle_Over"
+           image_overlay="Command_Speak_Icon"
+           image_selected="Toolbar_Middle_Selected"
+           image_unselected="Generic_Person_Large"
            layout="topleft"
            follows="left|top"
            top="0"
            left="0"
            width="24"
            height="24"/>
-          <icon
+
+          <button
            name="allow_to_see_on_map"
-           image_name="Generic_Person_Large"
+           image_hover_unselected="Toolbar_Middle_Over"
+           image_overlay="Command_Speak_Icon"
+           image_selected="Toolbar_Middle_Selected"
+           image_unselected="Generic_Person_Large"
            layout="topleft"
            follows="left|top"
            top_pad="7"
            left="0"
            width="24"
            height="24"/>
-          <icon
+
+          <button
            name="allow_edit_my_objects"
-           image_name="Generic_Person_Large"
+           image_hover_unselected="Toolbar_Middle_Over"
+           image_overlay="Command_Speak_Icon"
+           image_selected="Toolbar_Middle_Selected"
+           image_unselected="Generic_Person_Large"
            layout="topleft"
            follows="left|top"
            top_pad="7"
-- 
cgit v1.2.3


From 3678678506d9d026ebdb88d3775920e6b0b32f8a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 15 Apr 2022 01:02:39 +0300
Subject: SL-15312 Legacy profiles remake #7

Finalized agent profile permissions floater
---
 .../default/xui/en/floater_profile_permissions.xml | 27 ++++++++++++----------
 .../default/xui/en/panel_profile_secondlife.xml    |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_profile_permissions.xml b/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
index d186146770..62cf9b3272 100644
--- a/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
@@ -7,15 +7,18 @@
  header_height="10"
  bg_opaque_image="Window_NoTitle_Foreground"
  bg_alpha_image="Window_NoTitle_Background"
- height="200"
+ height="115"
  layout="topleft"
  name="profile_permissiona"
  width="300">
+  <string
+   name="description_string"
+   value="Allow [AGENT_NAME] to:" />
   <text
    name="perm_description"
-   value="Allow [AGENT_NAME] to:"
-   top="5"
-   left="6"
+   value="Allow agent to:"
+   top="1"
+   left="12"
    right="-6"
    height="16"
    follows="top|left"
@@ -26,7 +29,7 @@
    name="online_check"
    label="See when I am online"
    top_pad="5"
-   left="10"
+   left="16"
    height="16"
    width="293"
    follows="top|left"
@@ -36,7 +39,7 @@
    name="map_check"
    label="Find me on the world map"
    top_pad="5"
-   left="10"
+   left="16"
    height="16"
    width="293"
    follows="top|left"
@@ -44,9 +47,9 @@
     />
   <check_box
    name="objects_check"
-   label="Edit, delete or take my objects"
+   label="Edit, delete or take my objects from my land"
    top_pad="5"
-   left="10"
+   left="16"
    height="16"
    width="293"
    follows="top|left"
@@ -56,18 +59,18 @@
    name="perms_btn_ok"
    label="OK"
    top_pad="5"
-   left="10"
+   left="42"
    height="20"
-   width="90"
+   width="100"
    follows="top|left"
    layout="topleft"/>
   <button
    name="perms_btn_cancel"
    label="Cancel"
    top_delta="0"
-   left_pad="10"
+   left_pad="12"
    height="20"
-   width="90"
+   width="100"
    follows="top|left"
    layout="topleft"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 5dd4a9116a..cc59e12c4b 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -140,7 +140,7 @@ Account: [ACCTTYPE]
            left="2"
            bottom="-1"
            height="25"
-           width="120"
+           width="140"
            label="Actions"
            halign="left"
            image_unselected="DropDown_Off"
-- 
cgit v1.2.3


From c9b83e8117026aa7fc70da3972049152a669b0fc Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 16 Apr 2022 01:01:01 +0300
Subject: SL-15312 Legacy profiles remake #8

Progress indicators, loading states and 'embedded' cleanup
---
 .../skins/default/xui/en/menu_profile_other.xml    | 11 ++++++++++
 .../default/xui/en/panel_profile_firstlife.xml     | 21 ++++++++++++------
 .../default/xui/en/panel_profile_secondlife.xml    | 25 ++++++++++++++++++++--
 3 files changed, 49 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_profile_other.xml b/indra/newview/skins/default/xui/en/menu_profile_other.xml
index 7731ee65d1..fff1f7b614 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_other.xml
@@ -127,6 +127,17 @@
      parameter="toggle_block_agent"/>
   </menu_item_check>
   <menu_item_separator name="separator_copy_options"/>
+  <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="Copy Display Name"
    layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index e656fd7b07..a957a2b454 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -26,13 +26,22 @@
      layout="topleft"
      top="10"
      left="8"
-     height="202"
-     width="202"/>
+     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="Change Photo"
-     top="167"
-     left_pad="5"
+     top="127"
+     left="175"
      height="20"
      width="120"
      follows="top|left"
@@ -50,7 +59,7 @@
      name="fl_description_edit"
      trusted_content="false"
      enabled="false"
-     top="220"
+     top="180"
      left="6"
      right="-6"
      height="224"
@@ -65,7 +74,7 @@
     <button
      name="fl_save_changes"
      label="Save"
-     top="429"
+     top="389"
      right="-108"
      height="20"
      width="80"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index cc59e12c4b..6c2460378e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -71,6 +71,16 @@ Account: [ACCTTYPE]
            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
@@ -134,6 +144,16 @@ Account: [ACCTTYPE]
            follows="left|top|right"
            layout="topleft"/>
 
+          <loading_indicator
+           name="progress_indicator"
+           left="56"
+           bottom="-30"
+           height="23"
+           width="23"
+           follows="left|bottom"
+           layout="topleft"
+           visible="false"/>
+
           <menu_button
            layout="topleft"
            follows="left|bottom"
@@ -323,6 +343,7 @@ Account: [ACCTTYPE]
          follows="all"
          layout="topleft"
          width="200"
+         height="159"
          auto_resize="true"
          user_resize="false">
           <!-- notes are only for other agents -->        
@@ -340,10 +361,10 @@ Account: [ACCTTYPE]
            trusted_content="false"
            always_show_icons="true"
            enabled="false"
-           top_pad="1"
+           top="18"
            left="1"
            right="-1"
-           bottom="-27"
+           bottom="-1"
            follows="all"
            layout="topleft"
            bg_readonly_color="Transparent"
-- 
cgit v1.2.3


From 8a39aaa3a485d9f1d4486c02e98286cfb08761d4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 18 Apr 2022 21:35:41 +0300
Subject: SL-15312 Legacy profiles remake #10

Fixed Typo
changed 'show in search' checkbox into combobox, implemented commit
Fixed fl textbox setting sl text instead of fl text
Fixed fl save/discard buttons not following resize
---
 .../default/xui/en/panel_profile_firstlife.xml     |  6 ++--
 .../default/xui/en/panel_profile_secondlife.xml    | 37 +++++++++++++++-------
 2 files changed, 29 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index a957a2b454..90e0f1bc05 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -74,12 +74,12 @@
     <button
      name="fl_save_changes"
      label="Save"
-     top="389"
+     top_pad="5"
      right="-108"
      height="20"
      width="80"
      enabled="false"
-     follows="top|right"
+     follows="right|bottom"
      layout="topleft"/>
     <button
      name="fl_discard_changes"
@@ -89,6 +89,6 @@
      height="20"
      width="100"
      enabled="false"
-     follows="top|right"
+     follows="right|bottom"
      layout="topleft"/>
 </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
index 6c2460378e..21743baf9d 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -381,26 +381,41 @@ Account: [ACCTTYPE]
          follows="all"
          layout="topleft"
          width="200"
-         auto_resize="true"
+         auto_resize="false"
          user_resize="false">
-          <!-- settings will be here -->
-          <check_box
-           name="show_in_search_checkbox"
-           label="Show in search"
-           tool_tip="Let people see you in search results"
-           left="1"
+          <!-- only for self -->
+          <text
+           name="search_label"
+           value="Show my profile in search:"
            top="1"
+           left="1"
+           right="-1"
            height="16"
-           width="130"
+           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"/>
+           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_stack>
-      
     </layout_panel>
   </layout_stack>
   
-- 
cgit v1.2.3


From ea0c810d2d082a9684d9ce6b9cbd888c87f06612 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 18 Apr 2022 23:39:21 +0300
Subject: SL-15312 Small tweaks for profiles

---
 .../skins/default/xui/en/menu_profile_other.xml    | 22 +++++++++++-----------
 .../skins/default/xui/en/panel_profile_notes.xml   | 14 +++++++-------
 .../default/xui/en/panel_profile_secondlife.xml    |  4 ++--
 3 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_profile_other.xml b/indra/newview/skins/default/xui/en/menu_profile_other.xml
index fff1f7b614..4db4d0922b 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_other.xml
@@ -85,6 +85,17 @@
      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"
@@ -127,17 +138,6 @@
      parameter="toggle_block_agent"/>
   </menu_item_check>
   <menu_item_separator name="separator_copy_options"/>
-  <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="Copy Display Name"
    layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_notes.xml b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
index 78d5fb5915..16e7365042 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
@@ -21,7 +21,7 @@
     />
     <text
      name="status_message"
-     value="Private notes on this avatar:"
+     value="Make notes about this person here. No one else can see your notes."
      top="6"
      left="6"
      right="-6"
@@ -33,10 +33,10 @@
     <text_editor
      name="notes_edit"
      enabled="false"
-     top_pad="4"
+     top="28"
      left="6"
      right="-6"
-     height="311"
+     bottom="-26"
      follows="all"
      layout="topleft"
      max_length="65530"
@@ -45,21 +45,21 @@
     <button
      name="notes_save_changes"
      label="Save"
-     top="429"
+     bottom="-1"
      right="-108"
      height="20"
      width="80"
      enabled="false"
-     follows="top|right"
+     follows="bottom|right"
      layout="topleft"/>
     <button
      name="notes_discard_changes"
      label="Discard"
-     top_delta="0"
+     bottom="-1"
      right="-4"
      height="20"
      width="100"
      enabled="false"
-     follows="top|right"
+     follows="bottom|right"
      layout="topleft"/>
 </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
index 21743baf9d..1402803ebe 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -380,7 +380,7 @@ Account: [ACCTTYPE]
          name="settings_panel"
          follows="all"
          layout="topleft"
-         width="200"
+         width="190"
          auto_resize="false"
          user_resize="false">
           <!-- only for self -->
@@ -399,7 +399,7 @@ Account: [ACCTTYPE]
            left="1"
            top="18"
            height="23"
-           width="140"
+           width="180"
            follows="left|top"
            layout="topleft"
            visible="true"
-- 
cgit v1.2.3


From 7d9ec1683faf97de1f1b640ab3b2a054a93fc5fa Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 27 Apr 2022 22:36:32 +0300
Subject: SL-15312 Fixed tab sizes and labels to be in line with other floaters

---
 indra/newview/skins/default/xui/en/floater_profile.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml
index 92207cdc36..1009fda4ea 100644
--- a/indra/newview/skins/default/xui/en/floater_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile.xml
@@ -31,7 +31,8 @@
          follows="all"
          layout="topleft"
          halign="center"
-         tab_min_width="55"
+         tab_min_width="70"
+         tab_height="30"
          tab_position="top"
         >
             <panel
@@ -44,7 +45,7 @@
             />
             <panel
              name="panel_profile_web"
-             label="Feed"
+             label="FEED"
              layout="topleft"
              class="panel_profile_web"
              filename="panel_profile_web.xml"
@@ -52,7 +53,7 @@
             />
             <panel
              name="panel_profile_picks"
-             label="Picks"
+             label="PICKS"
              layout="topleft"
              class="panel_profile_picks"
              filename="panel_profile_picks.xml"
@@ -60,7 +61,7 @@
             />
             <panel
              name="panel_profile_classifieds"
-             label="Classified"
+             label="CLASSIFIEDS"
              layout="topleft"
              class="panel_profile_classifieds"
              filename="panel_profile_classifieds.xml"
@@ -68,7 +69,7 @@
             />
             <panel
              name="panel_profile_firstlife"
-             label="Real Life"
+             label="REAL LIFE"
              layout="topleft"
              class="panel_profile_firstlife"
              filename="panel_profile_firstlife.xml"
@@ -76,7 +77,7 @@
             />
             <panel
              name="panel_profile_notes"
-             label="Notes"
+             label="MY NOTES"
              layout="topleft"
              class="panel_profile_notes"
              filename="panel_profile_notes.xml"
-- 
cgit v1.2.3


From 76beebae685d859d4afbff6db3ae6d7785b204da Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 9 May 2022 20:53:21 +0300
Subject: SL-15312 Fixed picks tabs being too thin

---
 .../skins/default/xui/en/panel_profile_pick.xml      | 20 ++++++++++----------
 .../skins/default/xui/en/panel_profile_picks.xml     |  1 +
 .../default/xui/en/panel_profile_secondlife.xml      |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_pick.xml b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
index 0417df43c9..b5e5f593a7 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
@@ -18,8 +18,8 @@
      name="pick_snapshot"
      top="10"
      left="10"
-     height="180"
-     width="290"
+     height="161"
+     width="260"
      follows="left|top"
      layout="topleft"
      fallback_image="default_land_picture.j2c"
@@ -41,7 +41,7 @@
      enabled="false"
      top_pad="8"
      left="10"
-     height="70"
+     height="102"
      width="290"
      follows="all"
      layout="topleft"
@@ -68,10 +68,10 @@
     <button
      name="teleport_btn"
      label="Teleport"
-     bottom="-40"
+     bottom="-27"
      left="10"
      height="20"
-     width="80"
+     width="100"
      follows="left|bottom"
      layout="topleft"
     />
@@ -79,7 +79,7 @@
      name="show_on_map_btn"
      label="Show on Map"
      bottom_delta="0"
-     left_pad="5"
+     left_pad="7"
      height="20"
      width="100"
      follows="left|bottom"
@@ -89,8 +89,8 @@
      name="set_to_curr_location_btn"
      label="Set Location"
      tool_tip="Set to Current Location"
-     bottom_delta="0"
-     left_pad="5"
+     bottom="-3"
+     left="10"
      height="20"
      width="100"
      follows="left|bottom"
@@ -100,8 +100,8 @@
     <button
      name="save_changes_btn"
      label="Save Pick"
-     bottom="-15"
-     left="10"
+     bottom_delta="0"
+     left_pad="7"
      height="20"
      width="100"
      follows="left|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_picks.xml b/indra/newview/skins/default/xui/en/panel_profile_picks.xml
index 56a48572d3..208441e7f7 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_picks.xml
@@ -66,6 +66,7 @@
      bottom="-5"
      left="4"
      right="-4"
+     tab_width="150"
      follows="all"
      layout="topleft"
      halign="left"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 1402803ebe..68d8726dc9 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -371,7 +371,7 @@ Account: [ACCTTYPE]
            border_visible="true"
            font="SansSerifSmall"
            h_pad="2"
-           max_length="65000"
+           max_length="1000"
            parse_urls="true"
            word_wrap="true"/>
         </layout_panel>
-- 
cgit v1.2.3


From 1e84d0e6494df1f5ccb3f69e53849bf26b01e385 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 11 May 2022 20:38:13 +0300
Subject: SL-15312 Profiles tweaks

Fix loading indicators to be at the center of picls and classified
Hide classifieds and picks related buttons for other agents
10px distance from image
Fix chat history menu button not working
Changed 'partner' field behavior
Prevent selection of disabled FL text field
---
 .../default/xui/en/panel_profile_classifieds.xml   | 182 +++++++++++++-------
 .../skins/default/xui/en/panel_profile_picks.xml   | 190 ++++++++++++++-------
 .../default/xui/en/panel_profile_secondlife.xml    |  79 ++++++---
 indra/newview/skins/default/xui/en/strings.xml     |   4 +-
 4 files changed, 306 insertions(+), 149 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
index ff27113d53..3dfa0a58df 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
@@ -13,66 +13,130 @@
      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"
+
+  <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"
-     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"
+     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"
-     halign="center"
-     mouse_opaque="false"
-     wrap="true"
-    >
-        Loading...
-    </text>
+     height="430"
+     auto_resize="true"
+     user_resize="false">
+      <tab_container
+       name="tab_classifieds"
+       top="0"
+       bottom="-21"
+       left="4"
+       right="-4"
+       follows="all"
+       layout="topleft"
+       halign="left"
+       tab_position="left"
+       tab_width="85"
+       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_picks.xml b/indra/newview/skins/default/xui/en/panel_profile_picks.xml
index 208441e7f7..44d5c448c0 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_picks.xml
@@ -13,78 +13,142 @@
      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_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"
-     halign="center"
+     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"
+      </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"
+      <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"
-     tab_width="150"
+    </layout_panel>
+    <layout_panel
+     name="main_body"
      follows="all"
      layout="topleft"
-     halign="left"
-     tab_position="left"
-     use_ellipses="true"
+     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"
     />
-    <text
-     name="picks_panel_text"
-     top="300"
-     left="110"
-     right="-110"
-     height="25"
-     follows="left|top|right"
+      
+    <layout_stack
+     name="indicator_stack"
+     top="220"
+     left="0"
+     right="-1"
+     height="28"
+     follows="top|left|right"
      layout="topleft"
-     halign="center"
-     mouse_opaque="false"
-     wrap="true"
+     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>
+      </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
index 68d8726dc9..e23da2b7fe 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -12,9 +12,6 @@
    <string 
     name="AgeFormat"
     value="[AGE]" />
-   <string
-    name="no_partner_text"
-    value="Partner: None" />
    <string
     name="partner_text"
     value="Partner: [LINK]" />
@@ -95,7 +92,7 @@ Account: [ACCTTYPE]
            value="(loading...)"
            font="SansSerifBigLarge"
            top="0"
-           left="2"
+           left="10"
            right="-1"
            height="20"
            follows="left|top|right"
@@ -105,7 +102,7 @@ Account: [ACCTTYPE]
            name="user_name"
            value="(loading...)"
            top_pad="0"
-           left="2"
+           left_delta="0"
            right="-1"
            height="16"
            follows="left|top|right"
@@ -115,34 +112,64 @@ Account: [ACCTTYPE]
            name="user_age"
            value="(loading...)"
            top_pad="0"
-           left="2"
+           left_delta="0"
            right="-1"
            height="16"
            follows="left|top|right"
            layout="topleft"/>
 
-          <text
-           type="string"
-           name="partner_link"
-           value="Partner: (loading...)"
+          <layout_stack
+           name="partner_stack"
            top_pad="0"
-           left="2"
+           left_delta="0"
            right="-1"
-           height="16"
+           height="64"
            follows="left|top|right"
            layout="topleft"
-           translate="false"
-           use_ellipses="true" />
+           animate="false"
+           orientation="vertical">
+            <layout_panel
+             name="partner_layout"
+             follows="all"
+             layout="topleft"
+             height="16"
+             auto_resize="false"
+             user_resize="false"
+             visible="false">
+              <text
+               type="string"
+               name="partner_link"
+               value="Partner: (loading...)"
+               top="0"
+               left="0"
+               right="-1"
+               height="16"
+               follows="left|top|right"
+               layout="topleft"
+               translate="false"
+               use_ellipses="true"
+               visible="true"/>
+            </layout_panel>
+
+            <layout_panel
+             name="account_layout"
+             follows="all"
+             layout="topleft"
+             height="48"
+             auto_resize="false"
+             user_resize="false">
+              <text
+               name="account_info"
+               value="Account: (loading...)"
+               top="15"
+               left="0"
+               right="-1"
+               height="16"
+               follows="left|top|right"
+               layout="topleft"/>
+            </layout_panel>
+          </layout_stack>
 
-          <text
-           name="account_info"
-           value="Account: (loading...)"
-           top_pad="0"
-           left="2"
-           right="-1"
-           height="16"
-           follows="left|top|right"
-           layout="topleft"/>
 
           <loading_indicator
            name="progress_indicator"
@@ -157,7 +184,7 @@ Account: [ACCTTYPE]
           <menu_button
            layout="topleft"
            follows="left|bottom"
-           left="2"
+           left="10"
            bottom="-1"
            height="25"
            width="140"
@@ -373,7 +400,9 @@ Account: [ACCTTYPE]
            h_pad="2"
            max_length="1000"
            parse_urls="true"
-           word_wrap="true"/>
+           word_wrap="true"
+           use_ellipses="true"
+           allow_scroll="false"/>
         </layout_panel>
 
         <layout_panel
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 324f1466a8..285ea03f8a 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2807,8 +2807,8 @@ If you continue to receive this message, please contact Second Life support for
     <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="NoAvatarPicksText">This person has no picks</string>
+    <string name="NoAvatarClassifiedsText">This person has no classifieds</string>
     <string name="PicksClassifiedsLoadingText">Loading...</string>
 
 	<!-- Multi Preview Floater -->
-- 
cgit v1.2.3


From 26ee1cc148223b26ee1bdef61f4840410c4ab22f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 12 May 2022 23:44:47 +0300
Subject: SL-15312 New group visibility toggle.

---
 .../skins/default/xui/en/floater_display_name.xml      |  2 +-
 .../default/xui/en/panel_group_list_item_short.xml     | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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 d14b4a1699..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"
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
index fb46d1cce3..ee99625497 100644
--- 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
@@ -53,12 +53,26 @@
      text_color="ScrollUnselectedColor"
      use_ellipses="true"
     />
+    <button
+     name="visibility_btn"
+     tool_tip="Toogle visibility in profile"
+     top_delta="-1"
+     left_pad="3"
+     right="-53"
+     height="14"
+     width="20"
+     follows="right"
+     image_pressed="Profile_Search_Visibility_Dark"
+     image_unselected="Profile_Search_Visibility_Light"
+     tab_stop="false"
+     visible="false"
+    />
     <button
      name="info_btn"
      tool_tip="More info"
-     top_delta="-2"
+     top_delta="-1"
      left_pad="3"
-     right="-31"
+     right="-30"
      height="16"
      width="16"
      follows="right"
-- 
cgit v1.2.3


From de8a61f71a16f950cbf64b5704b9952cb733403e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sun, 15 May 2022 12:31:49 +0300
Subject: SL-15312 Shortcut to notes

---
 .../newview/skins/default/xui/en/panel_profile_secondlife.xml  | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index e23da2b7fe..3745706a5a 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -403,6 +403,16 @@ Account: [ACCTTYPE]
            word_wrap="true"
            use_ellipses="true"
            allow_scroll="false"/>
+          <button
+           follows="right|bottom"
+           layout="topleft"
+           name="open_notes"
+           tooltip="Show notes"
+           image_overlay="ForwardArrow_Off"
+           height="18"
+           bottom="-5"
+           right="-5"
+           width="20" />
         </layout_panel>
 
         <layout_panel
-- 
cgit v1.2.3


From 35a5fc74c0df29b496d42e89845d00a366034b68 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 18 May 2022 23:53:53 +0300
Subject: SL-15312 Added permission indicators

---
 .../default/xui/en/panel_profile_secondlife.xml    | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 3745706a5a..c63bf835ff 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -210,10 +210,10 @@ Account: [ACCTTYPE]
 
           <button
            name="allow_to_see_online"
-           image_hover_unselected="Toolbar_Middle_Over"
-           image_overlay="Command_Speak_Icon"
-           image_selected="Toolbar_Middle_Selected"
-           image_unselected="Generic_Person_Large"
+           image_pressed="Profile_Perm_Online_Disabled"
+           image_pressed_selected="Profile_Perm_Online_Enabled"
+           image_unselected="Profile_Perm_Online_Disabled"
+           image_selected="Profile_Perm_Online_Enabled"
            layout="topleft"
            follows="left|top"
            top="0"
@@ -223,10 +223,10 @@ Account: [ACCTTYPE]
 
           <button
            name="allow_to_see_on_map"
-           image_hover_unselected="Toolbar_Middle_Over"
-           image_overlay="Command_Speak_Icon"
-           image_selected="Toolbar_Middle_Selected"
-           image_unselected="Generic_Person_Large"
+           image_pressed="Profile_Perm_Find_Disabled"
+           image_pressed_selected="Profile_Perm_Find_Enabled"
+           image_unselected="Profile_Perm_Find_Disabled"
+           image_selected="Profile_Perm_Find_Enabled"
            layout="topleft"
            follows="left|top"
            top_pad="7"
@@ -236,10 +236,10 @@ Account: [ACCTTYPE]
 
           <button
            name="allow_edit_my_objects"
-           image_hover_unselected="Toolbar_Middle_Over"
-           image_overlay="Command_Speak_Icon"
-           image_selected="Toolbar_Middle_Selected"
-           image_unselected="Generic_Person_Large"
+           image_pressed="Profile_Perm_Objects_Disabled"
+           image_pressed_selected="Profile_Perm_Objects_Enabled"
+           image_unselected="Profile_Perm_Objects_Disabled"
+           image_selected="Profile_Perm_Objects_Enabled"
            layout="topleft"
            follows="left|top"
            top_pad="7"
-- 
cgit v1.2.3


From f15ad900e45bef02783f209e5b8ba5137447ab27 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 24 May 2022 00:15:51 +0300
Subject: SL-15312 Added new group visibility icons

---
 .../skins/default/xui/en/menu_gesture_gear.xml     |  2 +-
 .../default/xui/en/panel_group_list_item_short.xml | 27 ++++++++++++++++------
 2 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
index ee99625497..b72af7221e 100644
--- 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
@@ -54,23 +54,36 @@
      use_ellipses="true"
     />
     <button
-     name="visibility_btn"
-     tool_tip="Toogle visibility in profile"
-     top_delta="-1"
+     name="visibility_hide_btn"
+     tool_tip="Hide group on my profile"
+     top_delta="-3"
      left_pad="3"
      right="-53"
-     height="14"
+     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_Search_Visibility_Dark"
-     image_unselected="Profile_Search_Visibility_Light"
+     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="-1"
+     top_delta="2"
      left_pad="3"
      right="-30"
      height="16"
-- 
cgit v1.2.3


From 23d310436a664f7303d627095f8972de6cb17334 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 24 May 2022 00:35:22 +0300
Subject: SL-15312 Change permission status to be icons instead of buttons

---
 .../default/xui/en/panel_profile_secondlife.xml    | 85 ++++++++++++++++------
 1 file changed, 61 insertions(+), 24 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index c63bf835ff..56cf673e19 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -205,48 +205,85 @@ Account: [ACCTTYPE]
          width="26"
          auto_resize="false"
          user_resize="false">
-          <!--Todo: progress indicator-->
-          <!--Todo: Waits for icons. Current behavior is suboptimal and is a placeholder-->
 
-          <button
-           name="allow_to_see_online"
-           image_pressed="Profile_Perm_Online_Disabled"
-           image_pressed_selected="Profile_Perm_Online_Enabled"
-           image_unselected="Profile_Perm_Online_Disabled"
-           image_selected="Profile_Perm_Online_Enabled"
+          <icon
+           tool_tip="Can see online status"
+           mouse_opaque="true"
+           name="can_see_online"
+           image_name="Profile_Perm_Online_Enabled"
+           layout="topleft"
+           follows="left|top"
+           top="0"
+           left="0"
+           height="24"
+           width="24"
+           left_pad="2" />
+          
+          <icon
+           tool_tip="Can not see online status"
+           mouse_opaque="true"
+           name="cant_see_online"
+           image_name="Profile_Perm_Online_Disabled"
            layout="topleft"
            follows="left|top"
            top="0"
            left="0"
+           height="24"
            width="24"
-           height="24"/>
+           left_pad="2" />
 
-          <button
-           name="allow_to_see_on_map"
-           image_pressed="Profile_Perm_Find_Disabled"
-           image_pressed_selected="Profile_Perm_Find_Enabled"
-           image_unselected="Profile_Perm_Find_Disabled"
-           image_selected="Profile_Perm_Find_Enabled"
+          <icon
+           tool_tip="Can see on map"
+           mouse_opaque="true"
+           name="can_see_on_map"
+           image_name="Profile_Perm_Find_Enabled"
            layout="topleft"
            follows="left|top"
            top_pad="7"
            left="0"
+           height="24"
            width="24"
-           height="24"/>
+           left_pad="2" />
 
-          <button
-           name="allow_edit_my_objects"
-           image_pressed="Profile_Perm_Objects_Disabled"
-           image_pressed_selected="Profile_Perm_Objects_Enabled"
-           image_unselected="Profile_Perm_Objects_Disabled"
-           image_selected="Profile_Perm_Objects_Enabled"
+          <icon
+           tool_tip="Can not see on map"
+           mouse_opaque="true"
+           name="cant_see_on_map"
+           image_name="Profile_Perm_Find_Disabled"
+           layout="topleft"
+           follows="left|top"
+           top_delta="0"
+           left="0"
+           height="24"
+           width="24"
+           left_pad="2" />
+
+          <icon
+           tool_tip="Can edit my objects"
+           mouse_opaque="true"
+           name="can_edit_objects"
+           image_name="Profile_Perm_Objects_Enabled"
            layout="topleft"
            follows="left|top"
            top_pad="7"
            left="0"
+           height="24"
            width="24"
-           height="24"/>
-        
+           left_pad="2" />
+
+          <icon
+           tool_tip="Can not edit my objects"
+           mouse_opaque="true"
+           name="cant_edit_objects"
+           image_name="Profile_Perm_Objects_Disabled"
+           layout="topleft"
+           follows="left|top"
+           top_delta="0"
+           left="0"
+           height="24"
+           width="24"
+           left_pad="2" />
+
         </layout_panel>
       </layout_stack>
 
-- 
cgit v1.2.3


From d4a799a1a8ce11a808c97d73c03f16d3b3e41597 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 27 May 2022 17:55:04 +0300
Subject: SL-15312 Online status

---
 .../default/xui/en/panel_profile_secondlife.xml    | 108 +++++++++++++++++++--
 1 file changed, 98 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 56cf673e19..853e782de1 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -123,10 +123,11 @@ Account: [ACCTTYPE]
            top_pad="0"
            left_delta="0"
            right="-1"
-           height="64"
+           height="80"
            follows="left|top|right"
            layout="topleft"
            animate="false"
+           border_size="0"
            orientation="vertical">
             <layout_panel
              name="partner_layout"
@@ -150,18 +151,105 @@ Account: [ACCTTYPE]
                use_ellipses="true"
                visible="true"/>
             </layout_panel>
-
+            <layout_panel
+             name="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="Green"
+               top="0"
+               left="0"
+               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="0"
+               height="10"
+               width="10"/>
+              <text
+               name="online_text"
+               value="Online"
+               top="0"
+               left="13"
+               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="0"
+               height="10"
+               width="10"/>
+              <text
+               name="offline_text"
+               value="Offline"
+               top="0"
+               left="13"
+               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="48"
+             height="33"
              auto_resize="false"
              user_resize="false">
               <text
                name="account_info"
                value="Account: (loading...)"
-               top="15"
+               top="0"
                left="0"
                right="-1"
                height="16"
@@ -207,7 +295,7 @@ Account: [ACCTTYPE]
          user_resize="false">
 
           <icon
-           tool_tip="Can see online status"
+           tool_tip="Friend can see my online status"
            mouse_opaque="true"
            name="can_see_online"
            image_name="Profile_Perm_Online_Enabled"
@@ -220,7 +308,7 @@ Account: [ACCTTYPE]
            left_pad="2" />
           
           <icon
-           tool_tip="Can not see online status"
+           tool_tip="Friend can not see my online status"
            mouse_opaque="true"
            name="cant_see_online"
            image_name="Profile_Perm_Online_Disabled"
@@ -233,7 +321,7 @@ Account: [ACCTTYPE]
            left_pad="2" />
 
           <icon
-           tool_tip="Can see on map"
+           tool_tip="Friend can see me on map"
            mouse_opaque="true"
            name="can_see_on_map"
            image_name="Profile_Perm_Find_Enabled"
@@ -246,7 +334,7 @@ Account: [ACCTTYPE]
            left_pad="2" />
 
           <icon
-           tool_tip="Can not see on map"
+           tool_tip="Friend can not see me on map"
            mouse_opaque="true"
            name="cant_see_on_map"
            image_name="Profile_Perm_Find_Disabled"
@@ -259,7 +347,7 @@ Account: [ACCTTYPE]
            left_pad="2" />
 
           <icon
-           tool_tip="Can edit my objects"
+           tool_tip="Friend can edit my objects"
            mouse_opaque="true"
            name="can_edit_objects"
            image_name="Profile_Perm_Objects_Enabled"
@@ -272,7 +360,7 @@ Account: [ACCTTYPE]
            left_pad="2" />
 
           <icon
-           tool_tip="Can not edit my objects"
+           tool_tip="Friend can not edit my objects"
            mouse_opaque="true"
            name="cant_edit_objects"
            image_name="Profile_Perm_Objects_Disabled"
-- 
cgit v1.2.3


From 4ffc6c3fde17de5e18370139274bbd44b1b61a23 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 30 May 2022 22:06:59 +0300
Subject: SL-15312 Tweaks and fixes

- Allowed resizing text fields for classifieds in profiles
- Fixed mislabeled floater from picks to classifieds
- Fixed classified floater's title
- Added support to see multiple classifieds
- Removed obsolete panels
- Fixed pick requests for various menus
- Fixed pick creation from landmarks
- Improved online status handling
- Updated headers in files
---
 .../skins/default/xui/en/floater_classified.xml    |  20 ++
 .../newview/skins/default/xui/en/floater_picks.xml |  21 --
 .../skins/default/xui/en/panel_edit_classified.xml | 354 ---------------------
 .../skins/default/xui/en/panel_edit_pick.xml       | 239 --------------
 .../skins/default/xui/en/panel_pick_info.xml       | 190 -----------
 .../default/xui/en/panel_profile_classified.xml    |  10 +-
 .../default/xui/en/panel_profile_classifieds.xml   |   2 +-
 7 files changed, 26 insertions(+), 810 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_classified.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_picks.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_edit_classified.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_edit_pick.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_pick_info.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_classified.xml b/indra/newview/skins/default/xui/en/floater_classified.xml
new file mode 100644
index 0000000000..5b14c827d0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_classified.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ positioning="cascading"
+ can_close="true"
+ can_resize="false"
+ height="572"
+ help_topic="sidebar_me"
+ min_width="333"
+ min_height="440"
+ name="floater_classified"
+ save_rect="true"
+ save_visibility="false"
+ title="Classified"
+ width="333" >
+   <panel
+    class="panel_classified_info"
+    name="main_panel"
+    filename="panel_classified_info.xml"
+    follows="all"/>
+</floater>
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 3cd6abafe5..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="false"
- height="572"
- help_topic="sidebar_me"
- min_width="333"
- min_height="440"
- name="floater_picks"
- save_rect="true"
- save_visibility="false"
- reuse_instance="true"
- title="Picks"
- width="333" >
-   <panel
-    class="panel_classified_info"
-    name="main_panel"
-    filename="panel_classified_info.xml"
-    follows="all"/>
-</floater>
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 8b52b01bc5..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="cancel_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_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_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
index 60b13c0bc2..e4627309b3 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -78,7 +78,7 @@
          left="0"
          height="562"
          width="290"
-         follows="left|top"
+         follows="left|top|right"
          layout="topleft"
          background_visible="false"
          min_height="200"
@@ -88,9 +88,9 @@
              enabled="false"
              top="0"
              left="10"
-             height="197"
-             width="275"
-             follows="left|top|right"
+             height="161"
+             width="260"
+             follows="left|top"
              layout="topleft"
              fallback_image="default_land_picture.j2c"
             />
@@ -109,7 +109,7 @@
             />
             <layout_stack
              name="info_panel"
-             top="180"
+             top="145"
              left="0"
              height="375"
              width="320"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
index 3dfa0a58df..e73bb91506 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
@@ -74,7 +74,7 @@
        layout="topleft"
        halign="left"
        tab_position="left"
-       tab_width="85"
+       tab_width="150"
        use_ellipses="true"
       />
 
-- 
cgit v1.2.3


From ab3d986ac82e6c54804e8216d8ba2f72f8e8dfc8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 31 May 2022 22:41:21 +0300
Subject: SL-15312 Tweaks and fixes #2

- changed 'is friend' color
- fixed off/online status vanishing
- changed user name format
- fixed rights behavior
- cleaned up some unused code
- readded click functionality to permission icons (might need to return buttons instead)
---
 .../skins/default/xui/en/panel_profile_secondlife.xml  | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 853e782de1..7dd16de0ed 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -10,8 +10,8 @@
  layout="topleft"
 >
    <string 
-    name="AgeFormat"
-    value="[AGE]" />
+    name="NameAgeFormat"
+    value="[NAME] ([AGE])" />
    <string
     name="partner_text"
     value="Partner: [LINK]" />
@@ -99,17 +99,7 @@ Account: [ACCTTYPE]
            layout="topleft"/>
           
           <text
-           name="user_name"
-           value="(loading...)"
-           top_pad="0"
-           left_delta="0"
-           right="-1"
-           height="16"
-           follows="left|top|right"
-           layout="topleft"/>
-
-          <text
-           name="user_age"
+           name="user_name_age"
            value="(loading...)"
            top_pad="0"
            left_delta="0"
@@ -171,7 +161,7 @@ Account: [ACCTTYPE]
               <text
                name="frind_text"
                value="You are friends"
-               text_color="Green"
+               text_color="ConversationFriendColor"
                top="0"
                left="0"
                right="-1"
-- 
cgit v1.2.3


From 3efe64619b772ce8cab596d7e74de48dcc7f6c20 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 2 Jun 2022 00:17:54 +0300
Subject: SL-15312 Confirm usaved changes dialog when closing floater

---
 .../newview/skins/default/xui/en/notifications.xml | 40 +++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index aa93601669..5899e6df4e 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 &lt;nolink&gt;[CLASSIFIED]&lt;/nolink&gt;?
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ProfileDeletePick"
    type="alertmodal">
 Delete pick &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
     <tag>confirm</tag>
@@ -1506,6 +1518,32 @@ Delete pick &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alert.tga"
+   name="ProfileUnpublishedClassified"
+   type="alert">
+    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="alert">
+    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"
-- 
cgit v1.2.3


From 6354a053e366e1b6228c45a5dc9f92b262862dbe Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 3 Jun 2022 01:41:25 +0300
Subject: SL-15312 Show user's sl birthday

---
 .../skins/default/xui/en/panel_profile_secondlife.xml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 7dd16de0ed..63136fd6a4 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -10,8 +10,11 @@
  layout="topleft"
 >
    <string 
-    name="NameAgeFormat"
-    value="[NAME] ([AGE])" />
+    name="name_date_format"
+    value="[NAME], [mth,datetime,slt] [day,datetime,slt], [year,datetime,slt]" />
+   <string
+    name="age_format"
+    value="[AGE]" />
    <string
     name="partner_text"
     value="Partner: [LINK]" />
@@ -99,7 +102,17 @@ Account: [ACCTTYPE]
            layout="topleft"/>
           
           <text
-           name="user_name_age"
+           name="user_name_date"
+           value="(loading...)"
+           top_pad="0"
+           left_delta="0"
+           right="-1"
+           height="16"
+           follows="left|top|right"
+           layout="topleft"/>
+
+          <text
+           name="user_age"
            value="(loading...)"
            top_pad="0"
            left_delta="0"
-- 
cgit v1.2.3


From 3f5164446653f89ef559a883612401fea886b138 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 3 Jun 2022 20:30:39 +0300
Subject: SL-15312 Updated classified's layout

- better emphasis onto publsihing/saving button
- better resize logic
---
 .../default/xui/en/panel_profile_classified.xml    | 229 ++++++++++++++-------
 .../default/xui/en/panel_profile_classifieds.xml   |   2 +-
 2 files changed, 161 insertions(+), 70 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
index e4627309b3..eb09240617 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -4,7 +4,7 @@
  top="0"
  left="0"
  height="420"
- width="325"
+ width="315"
  follows="all"
  layout="topleft"
  help_topic="panel_profile_classified"
@@ -60,24 +60,43 @@
     >
         Save
     </string>
-    <scroll_container
-     name="profile_scroll"
-     top="0"
-     left="0"
-     bottom="-35"
-     width="320"
+
+  <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"
-     color="DkGray2"
-     opaque="true"
-     reserve_scroll_corner="false"
-    >
+     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="290"
+         width="280"
          follows="left|top|right"
          layout="topleft"
          background_visible="false"
@@ -112,7 +131,7 @@
              top="145"
              left="0"
              height="375"
-             width="320"
+             width="310"
              follows="all"
              layout="topleft"
              visible="true"
@@ -124,7 +143,7 @@
                  top="0"
                  left="0"
                  height="160"
-                 width="290"
+                 width="280"
                  follows="all"
                  layout="topleft"
                  auto_resize="false"
@@ -134,7 +153,7 @@
                      top="0"
                      left="10"
                      height="35"
-                     width="280"
+                     width="270"
                      follows="left|top|right"
                      layout="topleft"
                      allow_scroll="false"
@@ -167,7 +186,7 @@
                      top_pad="5"
                      left="10"
                      height="30"
-                     width="290"
+                     width="280"
                      follows="left|top"
                      layout="topleft"
                      allow_scroll="false"
@@ -622,33 +641,52 @@
                 />
               </panel>
         </panel>
-    </scroll_container>
-    <layout_stack
-     name="edit_btns_pnl"
-     bottom="-1"
-     left="9"
+      </scroll_container>
+    </layout_panel>
+
+    <layout_panel
+     follows="all"
+     width="310"
      height="25"
-     follows="left|right|bottom"
      layout="topleft"
-     orientation="horizontal"
-     animate="false"
-    >
+     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="true"
+            auto_resize="false"
             top="0"
-            width="101">
+            width="85">
             <button
              name="teleport_btn"
              label="Teleport"
              top="0"
              left="0"
              height="23"
-             width="101"
+             max_width="101"
+             width="85"
              follows="bottom|left|right"
              layout="topleft"
              />
@@ -660,15 +698,16 @@
             layout="bottomleft"
             left_pad="2"
             name="map_btn_lp"
-            auto_resize="true"
-            width="100">
+            auto_resize="false"
+            max_width="101"
+            width="85">
             <button
              name="show_on_map_btn"
              label="Map"
              top="0"
              left="0"
              height="23"
-             width="100"
+             width="85"
              follows="bottom|left|right"
              layout="topleft"
              />
@@ -680,60 +719,112 @@
             layout="bottomleft"
             left_pad="2"
             name="edit_btn_lp"
-            auto_resize="true"
-            width="101">
+            auto_resize="false"
+            max_width="101"
+            width="85">
             <button
              name="edit_btn"
              label="Edit"
              top="0"
              left="0"
              height="23"
-             width="101"
+             width="85"
              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"
+         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="40"
+     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="4"
+          width="310"/>
+      <layout_stack
+       name="publish_stack"
+       left="1"
+       right="-1"
+       top="10"
+       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"
-            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"
+         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_stack>
+
+        <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
index e73bb91506..1fc282124a 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
@@ -67,7 +67,7 @@
       <tab_container
        name="tab_classifieds"
        top="0"
-       bottom="-21"
+       bottom="-2"
        left="4"
        right="-4"
        follows="all"
-- 
cgit v1.2.3


From 4f92a3222efac36b2355550ed55ca0a2fcb9591d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 3 Jun 2022 21:24:09 +0300
Subject: SL-15312 Updated picks's layout

- better emphasis onto saving
- better resize logic
- ability to discard changes
---
 indra/newview/skins/default/xui/en/panel_picks.xml | 227 --------------
 .../default/xui/en/panel_profile_classified.xml    |   6 +-
 .../default/xui/en/panel_profile_classifieds.xml   |   2 +-
 .../skins/default/xui/en/panel_profile_pick.xml    | 340 +++++++++++++++------
 4 files changed, 251 insertions(+), 324 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/panel_picks.xml

(limited to 'indra/newview/skins/default/xui/en')

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
index eb09240617..e6a94a368f 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -746,7 +746,7 @@
     <layout_panel
      follows="all"
      width="310"
-     height="40"
+     height="41"
      layout="topleft"
      name="publish_layout_panel"
      auto_resize="false">
@@ -757,13 +757,13 @@
           layout="topleft"
           left="0"
           name="publish_emphasis_border"
-          top="4"
+          top="5"
           width="310"/>
       <layout_stack
        name="publish_stack"
        left="1"
        right="-1"
-       top="10"
+       top="11"
        height="25"
        follows="left|top|right"
        layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
index 1fc282124a..2b2f60e0c2 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
@@ -67,7 +67,7 @@
       <tab_container
        name="tab_classifieds"
        top="0"
-       bottom="-2"
+       bottom="-1"
        left="4"
        right="-4"
        follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_pick.xml b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
index b5e5f593a7..e39ad7c0c1 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
@@ -14,98 +14,252 @@
     >
         (will update after save)
     </panel.string>
-    <texture_picker
-     name="pick_snapshot"
-     top="10"
-     left="10"
-     height="161"
-     width="260"
-     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="102"
-     width="290"
+
+  <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="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="-27"
-     left="10"
-     height="20"
-     width="100"
-     follows="left|bottom"
-     layout="topleft"
-    />
-    <button
-     name="show_on_map_btn"
-     label="Show on Map"
-     bottom_delta="0"
-     left_pad="7"
-     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="-3"
-     left="10"
-     height="20"
-     width="100"
-     follows="left|bottom"
-     layout="topleft"
-     visible="false"
-    />
-    <button
-     name="save_changes_btn"
-     label="Save Pick"
-     bottom_delta="0"
-     left_pad="7"
-     height="20"
-     width="100"
-     follows="left|bottom"
-     layout="topleft"
-     visible="false"
-    />
+     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"
+      />
+      <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="102"
+       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="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>
-- 
cgit v1.2.3


From c88e30736bc6e8e005bbe9d9edde34f31f5012ab Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 4 Jun 2022 23:33:18 +0300
Subject: SL-15312 Updated sl bio layout

---
 .../skins/default/xui/en/floater_profile.xml       |   8 +-
 .../default/xui/en/panel_profile_secondlife.xml    | 844 ++++++++++-----------
 2 files changed, 392 insertions(+), 460 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml
index 1009fda4ea..61347c7348 100644
--- a/indra/newview/skins/default/xui/en/floater_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile.xml
@@ -2,13 +2,13 @@
 <floater
  name="avatarinfo"
  height="510"
- width="450"
+ width="510"
  layout="topleft"
  can_close="true"
  can_resize="true"
  help_topic="panel_my_profile_tab"
  min_height="510"
- min_width="450"
+ min_width="510"
  positioning="centered"
  save_rect="true"
  title="Profile"
@@ -18,7 +18,7 @@
      top="0"
      left="0"
      height="500"
-     width="445"
+     width="505"
      follows="all"
      class="panel_profile"
     >
@@ -27,7 +27,7 @@
          top_pad="5"
          left="0"
          height="500"
-         width="445"
+         width="505"
          follows="all"
          layout="topleft"
          halign="center"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 63136fd6a4..aa40f29e5d 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -10,8 +10,8 @@
  layout="topleft"
 >
    <string 
-    name="name_date_format"
-    value="[NAME], [mth,datetime,slt] [day,datetime,slt], [year,datetime,slt]" />
+    name="date_format"
+    value="SL birthdate: [mth,datetime,slt] [day,datetime,slt], [year,datetime,slt]" />
    <string
     name="age_format"
     value="[AGE]" />
@@ -25,358 +25,401 @@ Account: [ACCTTYPE]
     </string>
 
   <layout_stack
-   name="main_stack"
+   name="image_stack"
    top="8"
    left="6"
-   right="-1"
    bottom="-1"
-   follows="all"
+   width="160"
+   border_size="0"
+   follows="left|top|bottom"
    layout="topleft"
    animate="false"
    orientation="vertical">
-
     <layout_panel
-     name="name_details_image"
+     name="image_panel"
      follows="all"
      layout="topleft"
+     width="160"
      height="160"
      auto_resize="false"
      user_resize="false">
 
-      <layout_stack
-       name="name_details_image_stack"
+      <icon
+       name="2nd_life_pic"
+       image_name="Generic_Person_Large"
+       layout="topleft"
+       follows="all"
        top="0"
-       left="0"
-       right="-1"
+       left="2"
        bottom="-1"
-       follows="all"
-       layout="topleft"
-       animate="false"
-       orientation="horizontal">
+       right="-1"/>
 
-        <layout_panel
-         name="image_panel"
-         follows="all"
-         layout="topleft"
-         width="160"
-         auto_resize="false"
-         user_resize="false">
-
-          <icon
-           name="2nd_life_pic"
-           image_name="Generic_Person_Large"
-           layout="topleft"
-           follows="all"
-           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>
 
-          <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="details_panel"
-         follows="all"
-         layout="topleft"
-         auto_resize="true"
-         user_resize="false"
+    <layout_panel
+     name="basics_panel"
+     follows="all"
+     layout="topleft"
+     height="54"
+     auto_resize="false"
+     user_resize="false"
         >
-          <text
-           name="display_name"
-           value="(loading...)"
-           font="SansSerifBigLarge"
-           top="0"
-           left="10"
-           right="-1"
-           height="20"
-           follows="left|top|right"
-           layout="topleft"/>
-          
-          <text
-           name="user_name_date"
-           value="(loading...)"
-           top_pad="0"
-           left_delta="0"
-           right="-1"
-           height="16"
-           follows="left|top|right"
-           layout="topleft"/>
-
-          <text
-           name="user_age"
-           value="(loading...)"
-           top_pad="0"
-           left_delta="0"
-           right="-1"
-           height="16"
-           follows="left|top|right"
-           layout="topleft"/>
+      <text
+       name="user_name"
+       value="(loading...)"
+       top="6"
+       left="5"
+       right="-1"
+       height="16"
+       follows="left|top|right"
+       layout="topleft"/>
 
-          <layout_stack
-           name="partner_stack"
-           top_pad="0"
-           left_delta="0"
-           right="-1"
-           height="80"
-           follows="left|top|right"
-           layout="topleft"
-           animate="false"
-           border_size="0"
-           orientation="vertical">
-            <layout_panel
-             name="partner_layout"
-             follows="all"
-             layout="topleft"
-             height="16"
-             auto_resize="false"
-             user_resize="false"
-             visible="false">
-              <text
-               type="string"
-               name="partner_link"
-               value="Partner: (loading...)"
-               top="0"
-               left="0"
-               right="-1"
-               height="16"
-               follows="left|top|right"
-               layout="topleft"
-               translate="false"
-               use_ellipses="true"
-               visible="true"/>
-            </layout_panel>
-            <layout_panel
-             name="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="0"
-               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="0"
-               height="10"
-               width="10"/>
-              <text
-               name="online_text"
-               value="Online"
-               top="0"
-               left="13"
-               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="0"
-               height="10"
-               width="10"/>
-              <text
-               name="offline_text"
-               value="Offline"
-               top="0"
-               left="13"
-               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="0"
-               right="-1"
-               height="16"
-               follows="left|top|right"
-               layout="topleft"/>
-            </layout_panel>
-          </layout_stack>
+      <text
+       name="sl_birth_date"
+       value="(loading...)"
+       top_pad="0"
+       left_delta="0"
+       right="-1"
+       height="16"
+       follows="left|top|right"
+       layout="topleft"/>
 
+      <text
+       name="user_age"
+       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="33"
+     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>
 
-          <loading_indicator
-           name="progress_indicator"
-           left="56"
-           bottom="-30"
-           height="23"
-           width="23"
-           follows="left|bottom"
-           layout="topleft"
-           visible="false"/>
+    <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="13"
+       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"/>
+    </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="10"
+       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="10"
+       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>
 
-          <menu_button
-           layout="topleft"
-           follows="left|bottom"
-           left="10"
-           bottom="-1"
-           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_panel
-         name="permissions_panel"
-         follows="all"
-         layout="topleft"
-         width="26"
-         auto_resize="false"
-         user_resize="false">
+  <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">
+      <text
+       name="display_name"
+       value="(loading...)"
+       font="SansSerifBigLarge"
+       top="0"
+       left="7"
+       height="20"
+       width="200"
+       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="left|top"
-           top="0"
-           left="0"
-           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="left|top"
-           top="0"
-           left="0"
-           height="24"
-           width="24"
-           left_pad="2" />
+      <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"
+       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="left|top"
-           top_pad="7"
-           left="0"
-           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"
+       top="0"
+       right="-61"
+       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="left|top"
-           top_delta="0"
-           left="0"
-           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"
+       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="left|top"
-           top_pad="7"
-           left="0"
-           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"
+       top="0"
+       right="-30"
+       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="left|top"
-           top_delta="0"
-           left="0"
-           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"
+       top="0"
+       right="-1"
+       height="24"
+       width="24"
+       left_pad="2" />
 
-        </layout_panel>
-      </layout_stack>
+      <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"
+       top="0"
+       right="-1"
+       height="24"
+       width="24"
+       left_pad="2" />
 
     </layout_panel>
 
@@ -393,7 +436,7 @@ Account: [ACCTTYPE]
        always_show_icons="true"
        commit_on_focus_lost="false"
        enabled="false"
-       top="1"
+       top="0"
        left="1"
        right="-1"
        bottom="-1"
@@ -444,146 +487,35 @@ Account: [ACCTTYPE]
          top_pad="9"
          width="492"/>
     </layout_panel>
+
     <layout_panel
-     name="groups_notes_settings"
+     name="groups_panel"
      follows="all"
      layout="topleft"
      height="159"
      auto_resize="true"
      user_resize="false">
-
-      <layout_stack
-       name="groups_notes_settings_stack"
-       top="0"
+      <text
+       name="group_label"
+       value="Group membership"
+       top="1"
        left="1"
        right="-1"
-       height="159"
+       height="16"
+       follows="left|top|right"
+       layout="topleft"/>
+      <group_list
+       name="group_list"
+       top="18"
+       left="1"
+       right="-1"
+       bottom="-1"
        follows="all"
        layout="topleft"
-       animate="false"
-       orientation="horizontal">
-        <layout_panel
-         name="groups_panel"
-         follows="all"
-         layout="topleft"
-         width="200"
-         height="159"
-         auto_resize="true"
-         user_resize="false">
-          <text
-           name="group_label"
-           value="Group membership"
-           top="1"
-           left="1"
-           right="-1"
-           height="16"
-           follows="left|top|right"
-           layout="topleft"/>
-          <group_list
-           name="group_list"
-           top="18"
-           left="1"
-           right="-1"
-           bottom="-1"
-           follows="all"
-           layout="topleft"
-           border_visible="true"
-           color="ScrollBgWriteableColor"
-           for_agent="false"/>
-          
-        </layout_panel>
-        
-        <layout_panel
-         name="notes_panel"
-         follows="all"
-         layout="topleft"
-         width="200"
-         height="159"
-         auto_resize="true"
-         user_resize="false">
-          <!-- notes are only for other agents -->        
-          <text
-           name="notes_label"
-           value="My private notes:"
-           top="1"
-           left="1"
-           right="-1"
-           height="16"
-           follows="left|top|right"
-           layout="topleft"/>
-          <text_editor
-           name="notes_snippet"
-           trusted_content="false"
-           always_show_icons="true"
-           enabled="false"
-           top="18"
-           left="1"
-           right="-1"
-           bottom="-1"
-           follows="all"
-           layout="topleft"
-           bg_readonly_color="Transparent"
-           border_visible="true"
-           font="SansSerifSmall"
-           h_pad="2"
-           max_length="1000"
-           parse_urls="true"
-           word_wrap="true"
-           use_ellipses="true"
-           allow_scroll="false"/>
-          <button
-           follows="right|bottom"
-           layout="topleft"
-           name="open_notes"
-           tooltip="Show notes"
-           image_overlay="ForwardArrow_Off"
-           height="18"
-           bottom="-5"
-           right="-5"
-           width="20" />
-        </layout_panel>
-
-        <layout_panel
-         name="settings_panel"
-         follows="all"
-         layout="topleft"
-         width="190"
-         auto_resize="false"
-         user_resize="false">
-          <!-- only for self -->
-          <text
-           name="search_label"
-           value="Show my profile in search:"
-           top="1"
-           left="1"
-           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="180"
-           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>
+       border_visible="true"
+       color="ScrollBgWriteableColor"
+       for_agent="false"/>
 
-      </layout_stack>
     </layout_panel>
   </layout_stack>
-  
 </panel>
-- 
cgit v1.2.3


From c4aa8b1636b92f2b746df4ef319c10679883eb59 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 6 Jun 2022 18:22:57 +0300
Subject: SL-15312 Header fixes

fixed 'remove_proto' being active even if there is no photo.
---
 indra/newview/skins/default/xui/en/floater_profile.xml             | 2 +-
 indra/newview/skins/default/xui/en/floater_profile_permissions.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_profile_secondlife.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml
index 61347c7348..32ab811a6e 100644
--- a/indra/newview/skins/default/xui/en/floater_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile.xml
@@ -31,7 +31,7 @@
          follows="all"
          layout="topleft"
          halign="center"
-         tab_min_width="70"
+         tab_min_width="81"
          tab_height="30"
          tab_position="top"
         >
diff --git a/indra/newview/skins/default/xui/en/floater_profile_permissions.xml b/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
index 62cf9b3272..9f3b4d9a00 100644
--- a/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
@@ -9,7 +9,7 @@
  bg_alpha_image="Window_NoTitle_Background"
  height="115"
  layout="topleft"
- name="profile_permissiona"
+ name="profile_permissions"
  width="300">
   <string
    name="description_string"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index aa40f29e5d..0a74d934ac 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -497,7 +497,7 @@ Account: [ACCTTYPE]
      user_resize="false">
       <text
        name="group_label"
-       value="Group membership"
+       value="Group memberships"
        top="1"
        left="1"
        right="-1"
-- 
cgit v1.2.3


From 0c6afa58de6b57ad41d31a3dddaac9ef30321960 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 6 Jun 2022 18:55:33 +0300
Subject: SL-15312 Larger image preview

At the moment without cursor handling
---
 .../default/xui/en/floater_profile_texture.xml     | 88 ++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_profile_texture.xml

(limited to 'indra/newview/skins/default/xui/en')

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>
-- 
cgit v1.2.3


From 111d1d7c94887cb91bcb82ec6c86aaed133d8043 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 6 Jun 2022 21:27:13 +0300
Subject: SL-15312 Fixed group names not having padding

Plus some focus and interactibility fixes
---
 indra/newview/skins/default/xui/en/panel_profile_secondlife.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 0a74d934ac..53bd9666c1 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -49,6 +49,7 @@ Account: [ACCTTYPE]
        image_name="Generic_Person_Large"
        layout="topleft"
        follows="all"
+       interactable="true"
        top="0"
        left="2"
        bottom="-1"
@@ -350,6 +351,7 @@ Account: [ACCTTYPE]
        image_name="Profile_Perm_Online_Enabled"
        layout="topleft"
        follows="right|top"
+       interactable="true"
        top="0"
        right="-61"
        height="24"
@@ -363,6 +365,7 @@ Account: [ACCTTYPE]
        image_name="Profile_Perm_Online_Disabled"
        layout="topleft"
        follows="right|top"
+       interactable="true"
        top="0"
        right="-61"
        height="24"
@@ -376,6 +379,7 @@ Account: [ACCTTYPE]
        image_name="Profile_Perm_Find_Enabled"
        layout="topleft"
        follows="right|top"
+       interactable="true"
        top="0"
        right="-30"
        height="24"
@@ -389,6 +393,7 @@ Account: [ACCTTYPE]
        image_name="Profile_Perm_Find_Disabled"
        layout="topleft"
        follows="right|top"
+       interactable="true"
        top="0"
        right="-30"
        height="24"
@@ -402,6 +407,7 @@ Account: [ACCTTYPE]
        image_name="Profile_Perm_Objects_Enabled"
        layout="topleft"
        follows="right|top"
+       interactable="true"
        top="0"
        right="-1"
        height="24"
@@ -415,6 +421,7 @@ Account: [ACCTTYPE]
        image_name="Profile_Perm_Objects_Disabled"
        layout="topleft"
        follows="right|top"
+       interactable="true"
        top="0"
        right="-1"
        height="24"
-- 
cgit v1.2.3


From 206892fe9e03b906fad94e83f58e263b4d6745c6 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 7 Jun 2022 21:00:56 +0300
Subject: SL-17532 Apply padding after 'partner'

---
 .../skins/default/xui/en/panel_profile_secondlife.xml    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 53bd9666c1..d8c4f97696 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -108,7 +108,7 @@ Account: [ACCTTYPE]
      name="partner_layout"
      follows="all"
      layout="topleft"
-     height="33"
+     height="30"
      auto_resize="false"
      user_resize="false"
      visible="true">
@@ -180,7 +180,7 @@ Account: [ACCTTYPE]
        name="online_text"
        value="Online"
        top="0"
-       left="13"
+       left="18"
        right="-1"
        height="16"
        follows="left|top|right"
@@ -271,7 +271,7 @@ Account: [ACCTTYPE]
       <combo_box
        name="show_in_search"
        tool_tip="Let people see you in search results"
-       left="10"
+       left="1"
        top="18"
        height="23"
        width="140"
@@ -301,7 +301,7 @@ Account: [ACCTTYPE]
       <menu_button
        layout="topleft"
        follows="left|top"
-       left="10"
+       left="1"
        top="25"
        height="25"
        width="140"
@@ -338,7 +338,7 @@ Account: [ACCTTYPE]
        value="(loading...)"
        font="SansSerifBigLarge"
        top="0"
-       left="7"
+       left="8"
        height="20"
        width="200"
        follows="left|top|right"
@@ -444,7 +444,7 @@ Account: [ACCTTYPE]
        commit_on_focus_lost="false"
        enabled="false"
        top="0"
-       left="1"
+       left="2"
        right="-1"
        bottom="-1"
        follows="all"
@@ -506,7 +506,7 @@ Account: [ACCTTYPE]
        name="group_label"
        value="Group memberships"
        top="1"
-       left="1"
+       left="2"
        right="-1"
        height="16"
        follows="left|top|right"
@@ -514,7 +514,7 @@ Account: [ACCTTYPE]
       <group_list
        name="group_list"
        top="18"
-       left="1"
+       left="2"
        right="-1"
        bottom="-1"
        follows="all"
-- 
cgit v1.2.3


From 96d717d17b0edbc22fe39a51d985498b47e372f5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 8 Jun 2022 19:17:19 +0300
Subject: SL-17532 Make names selectable

---
 .../default/xui/en/panel_profile_secondlife.xml    | 41 ++++++++++++++++------
 1 file changed, 31 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index d8c4f97696..551b477876 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -74,18 +74,28 @@ Account: [ACCTTYPE]
      auto_resize="false"
      user_resize="false"
         >
-      <text
+      <line_editor
        name="user_name"
+       border_thickness="0"
+       use_bg_color="false"
+       background_image_disabled=""
+       background_image_focused=""
+       enabled="false"
        value="(loading...)"
-       top="6"
-       left="5"
+       top="4"
+       left="3"
        right="-1"
        height="16"
        follows="left|top|right"
        layout="topleft"/>
 
-      <text
+      <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"
@@ -94,8 +104,13 @@ Account: [ACCTTYPE]
        follows="left|top|right"
        layout="topleft"/>
 
-      <text
+      <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"
@@ -232,7 +247,8 @@ Account: [ACCTTYPE]
        right="-1"
        height="16"
        follows="left|top|right"
-       layout="topleft"/>
+       layout="topleft"
+       word_wrap="true"/>
     </layout_panel>
     <layout_panel
      name="indicator_stack"
@@ -333,14 +349,19 @@ Account: [ACCTTYPE]
      height="24"
      auto_resize="false"
      user_resize="false">
-      <text
+      <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="8"
-       height="20"
-       width="200"
+       left="6"
+       height="19"
+       right="-86"
        follows="left|top|right"
        layout="topleft"/>
 
-- 
cgit v1.2.3


From ababcc700cc956c4c024f03bf69ca2fdb3e7baed Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 9 Jun 2022 00:22:02 +0300
Subject: SL-17532 Ability to pick inventory image as a profile image

---
 indra/newview/skins/default/xui/en/menu_avatar_self.xml       |  7 +++++++
 indra/newview/skins/default/xui/en/menu_profile_self.xml      | 11 +++++++++++
 .../newview/skins/default/xui/en/panel_profile_firstlife.xml  | 11 ++++++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

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_profile_self.xml b/indra/newview/skins/default/xui/en/menu_profile_self.xml
index 552c96c60c..d0bd4000f8 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_self.xml
@@ -18,6 +18,17 @@
      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"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index 90e0f1bc05..ca1e405a62 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -39,8 +39,17 @@
      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="127"
+     top_pad="5"
      left="175"
      height="20"
      width="120"
-- 
cgit v1.2.3


From eab708daed3c5c0873c3fb96cd2d716e2ecb9ff1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 10 Aug 2022 16:15:39 +0300
Subject: SL-17923 "Title" and "Description" labels are not displayed in
 "Picks" tab

Fixed unlabeled fields in picks: For consistency purposes and for clarity both picks and classifieds should display title and descriprion labels.
Fixed extra large spacing in classifieds
---
 .../default/xui/en/panel_profile_classified.xml    |  8 ++--
 .../skins/default/xui/en/panel_profile_pick.xml    | 55 ++++++++++++++++++++--
 2 files changed, 56 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
index e6a94a368f..c9e8b242d4 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -119,10 +119,10 @@
              tool_tip="Click to select an image"
              top="0"
              left="0"
-             height="197"
-             width="272"
+             height="161"
+             width="260"
              layout="topleft"
-             follows="left|top|right"
+             follows="left|top"
              image_name="spacer24.tga"
              visible="false"
             />
@@ -449,7 +449,7 @@
             </layout_stack>
             <panel
              name="edit_panel"
-             top="180"
+             top="145"
              left="0"
              height="420"
              width="320"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_pick.xml b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
index e39ad7c0c1..3e91640093 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
@@ -42,24 +42,56 @@
        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="-15"
+       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="8"
+       top_pad="2"
        left="10"
-       height="102"
+       height="45"
        width="290"
        follows="all"
        layout="topleft"
@@ -70,9 +102,26 @@
        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"
-- 
cgit v1.2.3