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

---
 indra/newview/skins/default/colors.xml             |  16 +
 indra/newview/skins/default/xui/da/panel_me.xml    |   7 -
 .../skins/default/xui/da/panel_side_tray.xml       |  29 -
 .../newview/skins/default/xui/de/floater_picks.xml |   2 -
 indra/newview/skins/default/xui/de/panel_me.xml    |   4 -
 .../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 +-
 .../newview/skins/default/xui/es/floater_picks.xml |   2 -
 indra/newview/skins/default/xui/es/panel_me.xml    |   4 -
 .../newview/skins/default/xui/fr/floater_picks.xml |   2 -
 indra/newview/skins/default/xui/fr/panel_me.xml    |   4 -
 .../newview/skins/default/xui/it/floater_picks.xml |   2 -
 indra/newview/skins/default/xui/it/panel_me.xml    |   4 -
 .../newview/skins/default/xui/ja/floater_picks.xml |   2 -
 indra/newview/skins/default/xui/ja/panel_me.xml    |   4 -
 .../newview/skins/default/xui/pl/floater_picks.xml |   2 -
 indra/newview/skins/default/xui/pl/panel_me.xml    |   4 -
 .../newview/skins/default/xui/pt/floater_picks.xml |   2 -
 indra/newview/skins/default/xui/pt/panel_me.xml    |   4 -
 .../newview/skins/default/xui/ru/floater_picks.xml |   2 -
 indra/newview/skins/default/xui/ru/panel_me.xml    |   4 -
 .../newview/skins/default/xui/tr/floater_picks.xml |   2 -
 indra/newview/skins/default/xui/tr/panel_me.xml    |   4 -
 .../newview/skins/default/xui/zh/floater_picks.xml |   2 -
 indra/newview/skins/default/xui/zh/panel_me.xml    |   4 -
 38 files changed, 2209 insertions(+), 142 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/da/panel_me.xml
 delete mode 100644 indra/newview/skins/default/xui/da/panel_side_tray.xml
 delete mode 100644 indra/newview/skins/default/xui/de/floater_picks.xml
 delete mode 100644 indra/newview/skins/default/xui/de/panel_me.xml
 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
 delete mode 100644 indra/newview/skins/default/xui/es/floater_picks.xml
 delete mode 100644 indra/newview/skins/default/xui/es/panel_me.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_picks.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/panel_me.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_picks.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_me.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_picks.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/panel_me.xml
 delete mode 100644 indra/newview/skins/default/xui/pl/floater_picks.xml
 delete mode 100644 indra/newview/skins/default/xui/pl/panel_me.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_picks.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/panel_me.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/floater_picks.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/panel_me.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/floater_picks.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/panel_me.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_picks.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/panel_me.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index e0da7f5d9e..7869eb7267 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -877,6 +877,22 @@
       name="PanelNotificationListItem"
       value="0.3 0.3 0.3 .3" />
 
+	<!-- profiles -->
+    <color
+        name="StatusUserOnline"
+        reference="White" />
+    <color
+        name="StatusUserOffline"
+        reference="LtGray_35" />
+    <!-- Groups visible in own profiles -->
+    <color
+        name="GroupVisibleInProfile"
+        reference="TextBgFocusColor" />
+    <color
+        name="GroupHiddenInProfile"
+        reference="Gray" />
+    
+
   <!-- Generic color names (legacy) -->
   <color
     name="white"
diff --git a/indra/newview/skins/default/xui/da/panel_me.xml b/indra/newview/skins/default/xui/da/panel_me.xml
deleted file mode 100644
index f98ced5f91..0000000000
--- a/indra/newview/skins/default/xui/da/panel_me.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Min profil" name="panel_me">
-	<tab_container name="tabs">
-		<panel label="MIN PROFIL" name="panel_profile"/>
-		<panel label="MINE FAVORITTER" name="panel_picks"/>
-	</tab_container>
-</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_side_tray.xml b/indra/newview/skins/default/xui/da/panel_side_tray.xml
deleted file mode 100644
index 66c3e69904..0000000000
--- a/indra/newview/skins/default/xui/da/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Åbn/luk sidebar" name="sidebar_openclose" tab_title="Åbn/luk sidebar"/>
-	<sidetray_tab description="Hjem." name="sidebar_home" tab_title="Hjem">
-		<panel label="hjem" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Redigér din profile og favoritter." name="sidebar_me" tab_title="Min profil">
-		<panel_container name="panel_container">
-			<panel label="Mig" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Find venner, kontakter og personer tæt på." name="sidebar_people" tab_title="Personer">
-		<panel_container name="panel_container">
-			<panel label="Gruppe profil" name="panel_group_info_sidetray"/>
-			<panel label="Blokerede beboere og objekter" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Find steder du vil hen og steder du har været før." label="Steder" name="sidebar_places" tab_title="Steder">
-		<panel label="Steder" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Browse din beholdning." name="sidebar_inventory" tab_title="Min beholdning">
-		<panel label="Redigér beholdning" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Ændre dit nuværende udseende" name="sidebar_appearance" tab_title="Mit udseende">
-		<panel label="Redigér udseende" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/de/floater_picks.xml b/indra/newview/skins/default/xui/de/floater_picks.xml
deleted file mode 100644
index 2521920e83..0000000000
--- a/indra/newview/skins/default/xui/de/floater_picks.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_picks" title="Auswahlen"/>
diff --git a/indra/newview/skins/default/xui/de/panel_me.xml b/indra/newview/skins/default/xui/de/panel_me.xml
deleted file mode 100644
index f49446fbbf..0000000000
--- a/indra/newview/skins/default/xui/de/panel_me.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Mein Profil" name="panel_me">
-	<panel label="MEINE AUSWAHLEN" name="panel_picks"/>
-</panel>
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>
diff --git a/indra/newview/skins/default/xui/es/floater_picks.xml b/indra/newview/skins/default/xui/es/floater_picks.xml
deleted file mode 100644
index 255aa5dcdc..0000000000
--- a/indra/newview/skins/default/xui/es/floater_picks.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_picks" title="Destacados"/>
diff --git a/indra/newview/skins/default/xui/es/panel_me.xml b/indra/newview/skins/default/xui/es/panel_me.xml
deleted file mode 100644
index 850cd6ec71..0000000000
--- a/indra/newview/skins/default/xui/es/panel_me.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Mi perfil" name="panel_me">
-	<panel label="MIS DESTACADOS" name="panel_picks"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_picks.xml b/indra/newview/skins/default/xui/fr/floater_picks.xml
deleted file mode 100644
index f058ff668b..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_picks.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_picks" title="Favoris"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_me.xml b/indra/newview/skins/default/xui/fr/panel_me.xml
deleted file mode 100644
index 5676986228..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_me.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Mon profil" name="panel_me">
-	<panel label="MES FAVORIS" name="panel_picks"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/floater_picks.xml b/indra/newview/skins/default/xui/it/floater_picks.xml
deleted file mode 100644
index dfc539da66..0000000000
--- a/indra/newview/skins/default/xui/it/floater_picks.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_picks" title="Preferiti"/>
diff --git a/indra/newview/skins/default/xui/it/panel_me.xml b/indra/newview/skins/default/xui/it/panel_me.xml
deleted file mode 100644
index a134f6f1de..0000000000
--- a/indra/newview/skins/default/xui/it/panel_me.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Il mio profilo" name="panel_me">
-	<panel label="I MIEI PREFERITI" name="panel_picks"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_picks.xml b/indra/newview/skins/default/xui/ja/floater_picks.xml
deleted file mode 100644
index 359585eb86..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_picks.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_picks" title="ピック"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_me.xml b/indra/newview/skins/default/xui/ja/panel_me.xml
deleted file mode 100644
index 3df1ae8048..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_me.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="マイ プロフィール" name="panel_me">
-	<panel label="マイ-ピック" name="panel_picks"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/floater_picks.xml b/indra/newview/skins/default/xui/pl/floater_picks.xml
deleted file mode 100644
index a329e834db..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_picks.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<floater name="floater_picks" title="Miejsca" />
diff --git a/indra/newview/skins/default/xui/pl/panel_me.xml b/indra/newview/skins/default/xui/pl/panel_me.xml
deleted file mode 100644
index 431929420a..0000000000
--- a/indra/newview/skins/default/xui/pl/panel_me.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Mój Profil" name="panel_me">
-	<panel label="MIEJSCA" name="panel_picks" />
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_picks.xml b/indra/newview/skins/default/xui/pt/floater_picks.xml
deleted file mode 100644
index 9766196319..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_picks.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_picks" title="Destaques"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_me.xml b/indra/newview/skins/default/xui/pt/panel_me.xml
deleted file mode 100644
index 281c886bd4..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_me.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Meu perfil" name="panel_me">
-	<panel label="MEUS DESTAQUES" name="panel_picks"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/floater_picks.xml b/indra/newview/skins/default/xui/ru/floater_picks.xml
deleted file mode 100644
index e0ae8d6f03..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_picks.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_picks" title="Подборка"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_me.xml b/indra/newview/skins/default/xui/ru/panel_me.xml
deleted file mode 100644
index 21a125af87..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_me.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Мой профиль" name="panel_me">
-	<panel label="МОЯ ПОДБОРКА" name="panel_picks"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/floater_picks.xml b/indra/newview/skins/default/xui/tr/floater_picks.xml
deleted file mode 100644
index 513a2e319a..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_picks.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_picks" title="Seçmeler"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_me.xml b/indra/newview/skins/default/xui/tr/panel_me.xml
deleted file mode 100644
index 4b911c9ce6..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_me.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Profilim" name="panel_me">
-	<panel label="SEÇMELERİM" name="panel_picks"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_picks.xml b/indra/newview/skins/default/xui/zh/floater_picks.xml
deleted file mode 100644
index a8bfcd99e3..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_picks.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_picks" title="精選地點"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_me.xml b/indra/newview/skins/default/xui/zh/panel_me.xml
deleted file mode 100644
index aad1348e46..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_me.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="我的個人檔案" name="panel_me">
-	<panel label="我的精選地點" name="panel_picks"/>
-</panel>
-- 
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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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/textures/icons/CopyBright.png    | Bin 0 -> 519 bytes
 indra/newview/skins/default/textures/textures.xml  |   1 +
 .../skins/default/xui/en/menu_name_field.xml       |  22 ++++++++++
 .../default/xui/en/panel_profile_secondlife.xml    |  48 ++++++++++++++++-----
 4 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/CopyBright.png
 create mode 100644 indra/newview/skins/default/xui/en/menu_name_field.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/CopyBright.png b/indra/newview/skins/default/textures/icons/CopyBright.png
new file mode 100644
index 0000000000..8d21c47295
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/CopyBright.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 2540ee148d..444ad358c3 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -187,6 +187,7 @@ with the same filename but different name
   <texture name="Conv_log_inbox" file_name="icons/Conv_log_inbox.png" preload="false" />
 
   <texture name="Copy" file_name="icons/Copy.png" preload="false" />
+  <texture name="CopyBright" file_name="icons/CopyBright.png" preload="false" />
   
   <texture name="DisclosureArrow_Opened_Off" file_name="widgets/DisclosureArrow_Opened_Off.png" preload="true" />
 
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')

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')

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')

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')

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')

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 a990805bb3634a30198856c6ceae16c7ae97f90a Mon Sep 17 00:00:00 2001
From: eli <eli@lindenlab.com>
Date: Thu, 18 Jul 2019 15:56:45 -0700
Subject: FIX INTL-355 translation of Set58 for 9 languages, for project repo
 483-legacy_profiles

---
 .../skins/default/xui/de/floater_about_land.xml    |   2 +-
 .../default/xui/de/floater_preview_texture.xml     |  57 ++++-------
 .../skins/default/xui/de/floater_profile.xml       |  16 +++
 .../skins/default/xui/de/floater_snapshot.xml      |   9 ++
 .../skins/default/xui/de/menu_name_field.xml       |   6 ++
 .../newview/skins/default/xui/de/notifications.xml |   3 +
 .../skins/default/xui/de/panel_edit_classified.xml |   2 +-
 .../default/xui/de/panel_facebook_friends.xml      |   4 +-
 .../skins/default/xui/de/panel_facebook_photo.xml  |   8 +-
 .../skins/default/xui/de/panel_facebook_status.xml |   2 +-
 .../skins/default/xui/de/panel_group_general.xml   |   2 +-
 .../default/xui/de/panel_group_list_item_short.xml |   6 ++
 .../newview/skins/default/xui/de/panel_people.xml  |   1 +
 .../default/xui/de/panel_profile_classified.xml    | 110 +++++++++++++++++++++
 .../default/xui/de/panel_profile_classifieds.xml   |   9 ++
 .../default/xui/de/panel_profile_firstlife.xml     |   2 +
 .../default/xui/de/panel_profile_interests.xml     |  35 +++++++
 .../skins/default/xui/de/panel_profile_notes.xml   |   8 ++
 .../skins/default/xui/de/panel_profile_pick.xml    |  13 +++
 .../skins/default/xui/de/panel_profile_picks.xml   |  12 +++
 .../default/xui/de/panel_profile_secondlife.xml    |  77 +++++++++++++++
 .../skins/default/xui/de/panel_profile_web.xml     |  12 +++
 indra/newview/skins/default/xui/de/strings.xml     |  33 +++++++
 .../xui/es/floater_inventory_view_finder.xml       |   2 +-
 .../default/xui/es/floater_preview_texture.xml     |  57 ++++-------
 .../skins/default/xui/es/floater_profile.xml       |  16 +++
 .../skins/default/xui/es/floater_snapshot.xml      |   9 ++
 .../skins/default/xui/es/menu_name_field.xml       |   6 ++
 .../newview/skins/default/xui/es/notifications.xml |   3 +
 .../skins/default/xui/es/panel_edit_classified.xml |   2 +-
 .../skins/default/xui/es/panel_facebook_place.xml  |   2 +-
 .../skins/default/xui/es/panel_group_general.xml   |   2 +-
 .../default/xui/es/panel_group_list_item_short.xml |   6 ++
 .../newview/skins/default/xui/es/panel_people.xml  |   1 +
 .../default/xui/es/panel_profile_classified.xml    | 110 +++++++++++++++++++++
 .../default/xui/es/panel_profile_classifieds.xml   |   9 ++
 .../default/xui/es/panel_profile_firstlife.xml     |   2 +
 .../default/xui/es/panel_profile_interests.xml     |  35 +++++++
 .../skins/default/xui/es/panel_profile_notes.xml   |   8 ++
 .../skins/default/xui/es/panel_profile_pick.xml    |  13 +++
 .../skins/default/xui/es/panel_profile_picks.xml   |  12 +++
 .../default/xui/es/panel_profile_secondlife.xml    |  77 +++++++++++++++
 .../skins/default/xui/es/panel_profile_web.xml     |  12 +++
 indra/newview/skins/default/xui/es/strings.xml     |  33 +++++++
 .../skins/default/xui/fr/floater_about_land.xml    |   2 +-
 .../skins/default/xui/fr/floater_facebook.xml      |   2 +-
 .../default/xui/fr/floater_preview_texture.xml     |  57 ++++-------
 .../skins/default/xui/fr/floater_profile.xml       |  16 +++
 .../skins/default/xui/fr/floater_snapshot.xml      |   9 ++
 .../skins/default/xui/fr/menu_name_field.xml       |   6 ++
 .../newview/skins/default/xui/fr/notifications.xml |   3 +
 .../skins/default/xui/fr/panel_edit_classified.xml |   2 +-
 .../default/xui/fr/panel_facebook_friends.xml      |   2 +-
 .../skins/default/xui/fr/panel_facebook_photo.xml  |   8 +-
 .../skins/default/xui/fr/panel_facebook_status.xml |   2 +-
 .../default/xui/fr/panel_group_list_item_short.xml |   6 ++
 .../newview/skins/default/xui/fr/panel_people.xml  |   1 +
 .../default/xui/fr/panel_profile_classified.xml    | 110 +++++++++++++++++++++
 .../default/xui/fr/panel_profile_classifieds.xml   |   9 ++
 .../default/xui/fr/panel_profile_firstlife.xml     |   2 +
 .../default/xui/fr/panel_profile_interests.xml     |  35 +++++++
 .../skins/default/xui/fr/panel_profile_notes.xml   |   8 ++
 .../skins/default/xui/fr/panel_profile_pick.xml    |  13 +++
 .../skins/default/xui/fr/panel_profile_picks.xml   |  12 +++
 .../default/xui/fr/panel_profile_secondlife.xml    |  77 +++++++++++++++
 .../skins/default/xui/fr/panel_profile_web.xml     |  12 +++
 indra/newview/skins/default/xui/fr/strings.xml     |  33 +++++++
 .../skins/default/xui/it/floater_about_land.xml    |   2 +-
 .../default/xui/it/floater_preview_texture.xml     |  57 ++++-------
 .../skins/default/xui/it/floater_profile.xml       |  16 +++
 .../skins/default/xui/it/floater_snapshot.xml      |   9 ++
 .../skins/default/xui/it/menu_name_field.xml       |   6 ++
 .../newview/skins/default/xui/it/notifications.xml |   3 +
 .../skins/default/xui/it/panel_edit_classified.xml |   2 +-
 .../default/xui/it/panel_facebook_friends.xml      |   6 +-
 .../skins/default/xui/it/panel_facebook_photo.xml  |   4 +-
 .../skins/default/xui/it/panel_facebook_status.xml |  10 +-
 .../skins/default/xui/it/panel_group_general.xml   |   2 +-
 .../default/xui/it/panel_group_list_item_short.xml |   6 ++
 .../newview/skins/default/xui/it/panel_people.xml  |   1 +
 .../default/xui/it/panel_profile_classified.xml    | 110 +++++++++++++++++++++
 .../default/xui/it/panel_profile_classifieds.xml   |   9 ++
 .../default/xui/it/panel_profile_firstlife.xml     |   2 +
 .../default/xui/it/panel_profile_interests.xml     |  35 +++++++
 .../skins/default/xui/it/panel_profile_notes.xml   |   8 ++
 .../skins/default/xui/it/panel_profile_pick.xml    |  13 +++
 .../skins/default/xui/it/panel_profile_picks.xml   |  12 +++
 .../default/xui/it/panel_profile_secondlife.xml    |  77 +++++++++++++++
 .../skins/default/xui/it/panel_profile_web.xml     |  12 +++
 indra/newview/skins/default/xui/it/strings.xml     |  33 +++++++
 .../skins/default/xui/ja/floater_about_land.xml    |   2 +-
 .../default/xui/ja/floater_preview_texture.xml     |  57 ++++-------
 .../skins/default/xui/ja/floater_profile.xml       |  16 +++
 .../skins/default/xui/ja/floater_snapshot.xml      |   9 ++
 .../skins/default/xui/ja/menu_name_field.xml       |   6 ++
 .../newview/skins/default/xui/ja/notifications.xml |   3 +
 .../skins/default/xui/ja/panel_edit_classified.xml |   4 +-
 .../skins/default/xui/ja/panel_facebook_photo.xml  |   2 +-
 .../skins/default/xui/ja/panel_facebook_place.xml  |   2 +-
 .../skins/default/xui/ja/panel_facebook_status.xml |   4 +-
 .../default/xui/ja/panel_group_list_item_short.xml |   6 ++
 .../newview/skins/default/xui/ja/panel_people.xml  |   1 +
 .../default/xui/ja/panel_profile_classified.xml    | 110 +++++++++++++++++++++
 .../default/xui/ja/panel_profile_classifieds.xml   |   9 ++
 .../default/xui/ja/panel_profile_firstlife.xml     |   2 +
 .../default/xui/ja/panel_profile_interests.xml     |  35 +++++++
 .../skins/default/xui/ja/panel_profile_notes.xml   |   8 ++
 .../skins/default/xui/ja/panel_profile_pick.xml    |  13 +++
 .../skins/default/xui/ja/panel_profile_picks.xml   |  12 +++
 .../default/xui/ja/panel_profile_secondlife.xml    |  77 +++++++++++++++
 .../skins/default/xui/ja/panel_profile_web.xml     |  12 +++
 .../default/xui/ja/panel_snapshot_options.xml      |   2 +-
 indra/newview/skins/default/xui/ja/strings.xml     |  33 +++++++
 .../xui/pt/floater_inventory_view_finder.xml       |   2 +-
 .../default/xui/pt/floater_preview_texture.xml     |  57 ++++-------
 .../skins/default/xui/pt/floater_profile.xml       |  16 +++
 .../skins/default/xui/pt/floater_snapshot.xml      |   9 ++
 .../skins/default/xui/pt/menu_name_field.xml       |   6 ++
 .../newview/skins/default/xui/pt/notifications.xml |   3 +
 .../skins/default/xui/pt/panel_edit_classified.xml |   2 +-
 .../skins/default/xui/pt/panel_group_general.xml   |   2 +-
 .../default/xui/pt/panel_group_list_item_short.xml |   6 ++
 .../newview/skins/default/xui/pt/panel_people.xml  |   1 +
 .../default/xui/pt/panel_profile_classified.xml    | 110 +++++++++++++++++++++
 .../default/xui/pt/panel_profile_classifieds.xml   |   9 ++
 .../default/xui/pt/panel_profile_firstlife.xml     |   2 +
 .../default/xui/pt/panel_profile_interests.xml     |  35 +++++++
 .../skins/default/xui/pt/panel_profile_notes.xml   |   8 ++
 .../skins/default/xui/pt/panel_profile_pick.xml    |  13 +++
 .../skins/default/xui/pt/panel_profile_picks.xml   |  12 +++
 .../default/xui/pt/panel_profile_secondlife.xml    |  77 +++++++++++++++
 .../skins/default/xui/pt/panel_profile_web.xml     |  12 +++
 indra/newview/skins/default/xui/pt/strings.xml     |  33 +++++++
 .../xui/ru/floater_inventory_view_finder.xml       |   2 +-
 .../default/xui/ru/floater_preview_texture.xml     |  57 ++++-------
 .../skins/default/xui/ru/floater_profile.xml       |  16 +++
 .../skins/default/xui/ru/floater_report_abuse.xml  |   2 +-
 .../skins/default/xui/ru/floater_snapshot.xml      |   9 ++
 .../skins/default/xui/ru/menu_name_field.xml       |   6 ++
 .../newview/skins/default/xui/ru/notifications.xml |   3 +
 .../skins/default/xui/ru/panel_edit_classified.xml |   4 +-
 .../default/xui/ru/panel_facebook_friends.xml      |   2 +-
 .../skins/default/xui/ru/panel_facebook_photo.xml  |  14 +--
 .../skins/default/xui/ru/panel_facebook_place.xml  |   4 +-
 .../skins/default/xui/ru/panel_facebook_status.xml |  12 +--
 .../default/xui/ru/panel_group_list_item_short.xml |   6 ++
 .../newview/skins/default/xui/ru/panel_people.xml  |   1 +
 .../default/xui/ru/panel_profile_classified.xml    | 110 +++++++++++++++++++++
 .../default/xui/ru/panel_profile_classifieds.xml   |   9 ++
 .../default/xui/ru/panel_profile_firstlife.xml     |   2 +
 .../default/xui/ru/panel_profile_interests.xml     |  35 +++++++
 .../skins/default/xui/ru/panel_profile_notes.xml   |   8 ++
 .../skins/default/xui/ru/panel_profile_pick.xml    |  13 +++
 .../skins/default/xui/ru/panel_profile_picks.xml   |  12 +++
 .../default/xui/ru/panel_profile_secondlife.xml    |  77 +++++++++++++++
 .../skins/default/xui/ru/panel_profile_web.xml     |  12 +++
 indra/newview/skins/default/xui/ru/strings.xml     |  33 +++++++
 .../skins/default/xui/tr/floater_about_land.xml    |   2 +-
 .../skins/default/xui/tr/floater_facebook.xml      |   2 +-
 .../xui/tr/floater_inventory_view_finder.xml       |   2 +-
 .../default/xui/tr/floater_preview_texture.xml     |  57 ++++-------
 .../skins/default/xui/tr/floater_profile.xml       |  16 +++
 .../skins/default/xui/tr/floater_snapshot.xml      |   9 ++
 .../skins/default/xui/tr/menu_name_field.xml       |   6 ++
 .../newview/skins/default/xui/tr/notifications.xml |   3 +
 .../skins/default/xui/tr/panel_edit_classified.xml |   4 +-
 .../default/xui/tr/panel_facebook_friends.xml      |   4 +-
 .../skins/default/xui/tr/panel_facebook_photo.xml  |   6 +-
 .../skins/default/xui/tr/panel_facebook_place.xml  |   2 +-
 .../skins/default/xui/tr/panel_facebook_status.xml |   8 +-
 .../skins/default/xui/tr/panel_group_general.xml   |   2 +-
 .../default/xui/tr/panel_group_list_item_short.xml |   6 ++
 .../newview/skins/default/xui/tr/panel_people.xml  |   1 +
 .../default/xui/tr/panel_profile_classified.xml    | 110 +++++++++++++++++++++
 .../default/xui/tr/panel_profile_classifieds.xml   |   9 ++
 .../default/xui/tr/panel_profile_firstlife.xml     |   2 +
 .../default/xui/tr/panel_profile_interests.xml     |  35 +++++++
 .../skins/default/xui/tr/panel_profile_notes.xml   |   8 ++
 .../skins/default/xui/tr/panel_profile_pick.xml    |  13 +++
 .../skins/default/xui/tr/panel_profile_picks.xml   |  12 +++
 .../default/xui/tr/panel_profile_secondlife.xml    |  77 +++++++++++++++
 .../skins/default/xui/tr/panel_profile_web.xml     |  12 +++
 indra/newview/skins/default/xui/tr/strings.xml     |  33 +++++++
 .../default/xui/zh/floater_preview_texture.xml     |  57 ++++-------
 .../skins/default/xui/zh/floater_profile.xml       |  16 +++
 .../skins/default/xui/zh/floater_snapshot.xml      |   9 ++
 .../skins/default/xui/zh/menu_name_field.xml       |   6 ++
 .../newview/skins/default/xui/zh/notifications.xml |   3 +
 .../skins/default/xui/zh/panel_edit_classified.xml |   2 +-
 .../default/xui/zh/panel_group_list_item_short.xml |   6 ++
 .../newview/skins/default/xui/zh/panel_people.xml  |   1 +
 .../default/xui/zh/panel_profile_classified.xml    | 110 +++++++++++++++++++++
 .../default/xui/zh/panel_profile_classifieds.xml   |   9 ++
 .../default/xui/zh/panel_profile_firstlife.xml     |   2 +
 .../default/xui/zh/panel_profile_interests.xml     |  35 +++++++
 .../skins/default/xui/zh/panel_profile_notes.xml   |   8 ++
 .../skins/default/xui/zh/panel_profile_pick.xml    |  13 +++
 .../skins/default/xui/zh/panel_profile_picks.xml   |  12 +++
 .../default/xui/zh/panel_profile_secondlife.xml    |  77 +++++++++++++++
 .../skins/default/xui/zh/panel_profile_web.xml     |  12 +++
 indra/newview/skins/default/xui/zh/strings.xml     |  33 +++++++
 201 files changed, 3423 insertions(+), 426 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/de/floater_profile.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_name_field.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_group_list_item_short.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_profile_classified.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_profile_classifieds.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_profile_firstlife.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_profile_interests.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_profile_notes.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_profile_pick.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_profile_picks.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_profile_secondlife.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_profile_web.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_profile.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_name_field.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_group_list_item_short.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_profile_classified.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_profile_classifieds.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_profile_firstlife.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_profile_interests.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_profile_notes.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_profile_pick.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_profile_picks.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_profile_secondlife.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_profile_web.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_profile.xml
 create mode 100644 indra/newview/skins/default/xui/fr/menu_name_field.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_group_list_item_short.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_profile_classified.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_profile_classifieds.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_profile_firstlife.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_profile_interests.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_profile_notes.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_profile_pick.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_profile_picks.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_profile_secondlife.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_profile_web.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_profile.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_name_field.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_group_list_item_short.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_profile_classified.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_profile_classifieds.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_profile_firstlife.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_profile_interests.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_profile_notes.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_profile_pick.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_profile_picks.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_profile_secondlife.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_profile_web.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_profile.xml
 create mode 100644 indra/newview/skins/default/xui/ja/menu_name_field.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_profile_classified.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_profile_interests.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_profile_notes.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_profile_pick.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_profile_picks.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_profile_web.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_profile.xml
 create mode 100644 indra/newview/skins/default/xui/pt/menu_name_field.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_group_list_item_short.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_profile_classified.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_profile_classifieds.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_profile_firstlife.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_profile_interests.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_profile_notes.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_profile_pick.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_profile_picks.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_profile_secondlife.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_profile_web.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_profile.xml
 create mode 100644 indra/newview/skins/default/xui/ru/menu_name_field.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_group_list_item_short.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_profile_classified.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_profile_classifieds.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_profile_firstlife.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_profile_interests.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_profile_notes.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_profile_pick.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_profile_picks.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_profile_secondlife.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_profile_web.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_profile.xml
 create mode 100644 indra/newview/skins/default/xui/tr/menu_name_field.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_group_list_item_short.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_profile_classified.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_profile_classifieds.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_profile_firstlife.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_profile_interests.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_profile_notes.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_profile_pick.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_profile_picks.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_profile_secondlife.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_profile_web.xml
 create mode 100644 indra/newview/skins/default/xui/zh/floater_profile.xml
 create mode 100644 indra/newview/skins/default/xui/zh/menu_name_field.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_group_list_item_short.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_profile_classified.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_profile_classifieds.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_profile_firstlife.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_profile_interests.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_profile_notes.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_profile_pick.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_profile_picks.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_profile_secondlife.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_profile_web.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index 1e18ab20e8..fb6a729165 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -355,7 +355,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
 			<text name="allow_label5">
-				Avatare in anderen Parzellen können Avatare in dieser Parzelle sehen und mit ihnen chatten
+				Avatare in anderen Parzellen können Avatare in dieser Parzelle sehen und mit ihnen chatten.
 			</text>
 			<check_box label="Avatare sehen" name="SeeAvatarsCheck" tool_tip="Gestattet sowohl Avataren auf anderen Parzellen, Avatare auf dieser Parzelle zu sehen und mit ihnen zu chatten, als auch Ihnen, diese Avatare auf anderen Parzellen zu sehen und mit ihnen zu chatten."/>
 			<text name="landing_point">
diff --git a/indra/newview/skins/default/xui/de/floater_preview_texture.xml b/indra/newview/skins/default/xui/de/floater_preview_texture.xml
index 526c0813bd..b386d0288c 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_texture.xml
@@ -6,42 +6,23 @@
 	<floater.string name="Copy">
 		In Inventar kopieren
 	</floater.string>
-	<text name="desc txt">
-		Beschreibung:
-	</text>
-	<text name="dimensions">
-		[WIDTH]px x [HEIGHT]px
-	</text>
-	<text name="aspect_ratio">
-		Seitenverhältnis anzeigen
-	</text>
-	<combo_box name="combo_aspect_ratio" tool_tip="Mit einem vordefinierten Seitenverhältnis anzeigen">
-		<combo_item name="Unconstrained">
-			keines
-		</combo_item>
-		<combo_item name="1:1" tool_tip="Gruppeninsignien oder Beschreibung">
-			1:1
-		</combo_item>
-		<combo_item name="4:3" tool_tip="[SECOND_LIFE]-Profil">
-			4:3
-		</combo_item>
-		<combo_item name="10:7" tool_tip="Anzeigen und Suchergebnisse, Landmarken">
-			10:7
-		</combo_item>
-		<combo_item name="3:2" tool_tip="Über Land">
-			3:2
-		</combo_item>
-		<combo_item name="16:10">
-			16:10
-		</combo_item>
-		<combo_item name="16:9" tool_tip="Profilauswahl">
-			16:9
-		</combo_item>
-		<combo_item name="2:1">
-			2:1
-		</combo_item>
-	</combo_box>
-	<button label="OK" name="Keep"/>
-	<button label="Verwerfen" name="Discard"/>
-	<button label="Speichern unter" name="save_tex_btn"/>
+	<layout_stack name="preview_stack">
+		<layout_panel name="texture_panel">
+			<text name="desc txt">
+				Beschreibung:
+			</text>
+			<text name="dimensions">
+				[WIDTH]px x [HEIGHT]px
+			</text>
+			<text name="aspect_ratio">
+				Vorschau Seitenverhältnis
+			</text>
+			<combo_box name="combo_aspect_ratio" tool_tip="Mit einem vordefinierten Seitenverhältnis anzeigen"/>
+		</layout_panel>
+		<layout_panel name="buttons_panel">
+			<button label="OK" name="Keep"/>
+			<button label="Verwerfen" name="Discard"/>
+			<button label="Speichern unter" name="save_tex_btn"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_profile.xml b/indra/newview/skins/default/xui/de/floater_profile.xml
new file mode 100644
index 0000000000..eb03463930
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_profile.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarinfo" title="Profil">
+	<panel name="panel_profile_view">
+		<tab_container name="panel_profile_tabs">
+			<panel label="Second Life" name="panel_profile_secondlife"/>
+			<panel label="Web" name="panel_profile_web"/>
+			<panel label="Interessen" name="panel_profile_interests"/>
+			<panel label="Auswahlen" name="panel_profile_picks"/>
+			<panel label="Anzeige" name="panel_profile_classifieds"/>
+			<panel label="Echtes Leben" name="panel_profile_firstlife"/>
+			<panel label="Hinweise" name="panel_profile_notes"/>
+		</tab_container>
+		<button label="OK" name="ok_btn" tool_tip="Profiländerungen speichern und schließen"/>
+		<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml
index f0152ad8cd..636f320a95 100644
--- a/indra/newview/skins/default/xui/de/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml
@@ -6,6 +6,9 @@
 	<string name="postcard_progress_str">
 		E-Mail senden
 	</string>
+	<string name="facebook_progress_str">
+		Auf Facebook posten
+	</string>
 	<string name="profile_progress_str">
 		Posten
 	</string>
@@ -15,6 +18,9 @@
 	<string name="local_progress_str">
 		Speichern auf Computer
 	</string>
+	<string name="facebook_succeeded_str">
+		Bild hochgeladen
+	</string>
 	<string name="profile_succeeded_str">
 		Bild hochgeladen
 	</string>
@@ -27,6 +33,9 @@
 	<string name="local_succeeded_str">
 		Auf Computer gespeichert!
 	</string>
+	<string name="facebook_failed_str">
+		Fehler beim Hochladen des Bilds in Ihre Facebook-Chronik.
+	</string>
 	<string name="profile_failed_str">
 		Fehler beim Hochladen des Bilds in Ihr Profil.
 	</string>
diff --git a/indra/newview/skins/default/xui/de/menu_name_field.xml b/indra/newview/skins/default/xui/de/menu_name_field.xml
new file mode 100644
index 0000000000..1d293c9361
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_name_field.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="CopyMenu">
+	<menu_item_call label="Anzeigenamen kopieren" name="copy_display"/>
+	<menu_item_call label="Agent-Namen kopieren" name="copy_name"/>
+	<menu_item_call label="Agent-ID kopieren" name="copy_id"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 17ed6a5385..3a8fb686d9 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -2675,6 +2675,9 @@ Wählen Sie eine kleinere Landfläche.
 	<notification name="SystemMessage">
 		[MESSAGE]
 	</notification>
+	<notification name="FacebookConnect">
+		[MESSAGE]
+	</notification>
 	<notification name="FlickrConnect">
 		[MESSAGE]
 	</notification>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_classified.xml b/indra/newview/skins/default/xui/de/panel_edit_classified.xml
index bd270697ea..8adacb4a5f 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_classified.xml
@@ -46,7 +46,7 @@
 			<layout_panel name="save_changes_btn_lp">
 				<button label="[LABEL]" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="show_on_map_btn_lp">
+			<layout_panel name="cancel_btn_lp">
 				<button label="Abbrechen" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_friends.xml b/indra/newview/skins/default/xui/de/panel_facebook_friends.xml
index f6a8fda23e..1a0bbc7d30 100644
--- a/indra/newview/skins/default/xui/de/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/de/panel_facebook_friends.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_facebook_friends">
-	<string name="facebook_friends_empty" value="Sie haben gegenwärtig keine Facebook-Freunde, die gleichzeitig Einwohner von Second Life sind. Laden Sie Ihre Facebook-Freunde ein, Second Life beizutreten!"/>
-	<string name="facebook_friends_no_connected" value="Sie sind gegenwärtig nicht mit Facebook verbunden. Um eine Verbindung herzustellen und diese Funktion zu aktivieren, gehen Sie zur Registerkarte „Status“."/>
+	<string name="facebook_friends_empty" value="Sie haben gegenwärtig keine Facebook-Freunde, die ebenfalls Second Life-Einwohner sind. Laden Sie Ihre Facebook-Freunde ein, Second Life beizutreten!"/>
+	<string name="facebook_friends_no_connected" value="Sie sind gegenwärtig nicht mit Facebook verbunden. Um eine Verbindung herzustellen und diese Funktion zu aktivieren, wechseln Sie zur Registerkarte &quot;Status&quot;."/>
 	<accordion name="friends_accordion">
 		<accordion_tab name="tab_second_life_friends" title="SL-Freunde"/>
 		<accordion_tab name="tab_suggested_friends" title="Diese Personen als SL-Freunde hinzufügen"/>
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_photo.xml b/indra/newview/skins/default/xui/de/panel_facebook_photo.xml
index bc48931129..fac9fe9984 100644
--- a/indra/newview/skins/default/xui/de/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/de/panel_facebook_photo.xml
@@ -2,10 +2,10 @@
 <panel name="panel_facebook_photo">
 	<combo_box name="resolution_combobox" tool_tip="Bildauflösung">
 		<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
-		<combo_box.item label="640x480" name="640x480"/>
-		<combo_box.item label="800x600" name="800x600"/>
-		<combo_box.item label="1024x768" name="1024x768"/>
-		<combo_box.item label="1200x630" name="1200x630"/>
+		<combo_box.item label="640 x 480" name="640x480"/>
+		<combo_box.item label="800 x 600" name="800x600"/>
+		<combo_box.item label="1024 x 768" name="1024x768"/>
+		<combo_box.item label="1200 x 630" name="1200x630"/>
 	</combo_box>
 	<combo_box name="filters_combobox" tool_tip="Bildfilter">
 		<combo_box.item label="Kein Filter" name="NoFilter"/>
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_status.xml b/indra/newview/skins/default/xui/de/panel_facebook_status.xml
index 23c9d3b75f..1fefef548e 100644
--- a/indra/newview/skins/default/xui/de/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/de/panel_facebook_status.xml
@@ -13,7 +13,7 @@
 		</text>
 	</panel>
 	<text name="status_caption_label">
-		Was machst du gerade?
+		Was machen Sie gerade?
 	</text>
 	<button label="Posten" name="post_status_btn"/>
 	<button label="Abbrechen" name="cancel_status_btn"/>
diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml
index 9d4301de73..e50124c37e 100644
--- a/indra/newview/skins/default/xui/de/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_general.xml
@@ -46,7 +46,7 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
 		<check_box label="Jeder kann beitreten" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/>
 		<check_box label="Kosten für Beitritt" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen"/>
 		<spinner label="L$" name="spin_enrollment_fee" tool_tip="Wenn Beitrittsgebühr aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/>
-		<combo_box name="group_mature_check" tool_tip="Legt fest, ob Ihre Gruppeninformation moderate Inhalte enthält">
+		<combo_box name="group_mature_check" tool_tip="Legt fest, ob Ihre Gruppe als moderat eingestufte Informationen enthält">
 			<combo_item name="select_mature">
 				- Inhaltseinstufung auswählen -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/de/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/de/panel_group_list_item_short.xml
new file mode 100644
index 0000000000..fc911a64df
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_group_list_item_short.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="group_list_item">
+	<text name="group_name" value="Unbekannt"/>
+	<button name="info_btn" tool_tip="Mehr Infos"/>
+	<button name="profile_btn" tool_tip="Profil anzeigen"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index 1eb3d4d1b9..d16b011577 100644
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -40,6 +40,7 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Alle"/>
+				<accordion_tab name="tab_suggested_friends" title="Potenzielle Freunde"/>
 			</accordion>
 		</panel>
 		<panel label="GRUPPEN" name="groups_panel">
diff --git a/indra/newview/skins/default/xui/de/panel_profile_classified.xml b/indra/newview/skins/default/xui/de/panel_profile_classified.xml
new file mode 100644
index 0000000000..5c11a01977
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_profile_classified.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_profile_classified">
+	<panel.string name="type_mature">
+		Moderat
+	</panel.string>
+	<panel.string name="type_pg">
+		Generelle Inhalte
+	</panel.string>
+	<panel.string name="l$_price">
+		L$[PRICE]
+	</panel.string>
+	<panel.string name="click_through_text_fmt">
+		[TELEPORT] Teleportieren, [MAP] Karten, [PROFILE] Profil
+	</panel.string>
+	<panel.string name="date_fmt">
+		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+	</panel.string>
+	<panel.string name="auto_renew_on">
+		Aktiviert
+	</panel.string>
+	<panel.string name="auto_renew_off">
+		Deaktiviert
+	</panel.string>
+	<panel.string name="location_notice">
+		(wird nach dem Speichern aktualisiert)
+	</panel.string>
+	<string name="publish_label">
+		Veröffentlichen
+	</string>
+	<string name="save_label">
+		Speichern
+	</string>
+	<scroll_container name="profile_scroll">
+		<panel name="info_scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="Klicken, um ein Bild auszuwählen"/>
+			<layout_stack name="info_panel">
+				<layout_panel name="main_info_panel">
+					<text_editor name="classified_name">
+						[name]
+					</text_editor>
+					<text name="classified_location_label" value="Standort:"/>
+					<text_editor name="classified_location" value="[loading...]"/>
+					<text name="content_type_label" value="Inhaltsart:"/>
+					<text_editor name="content_type" value="[content type]"/>
+					<text name="category_label" value="Kategorie:"/>
+					<text_editor name="category" value="[category]"/>
+					<text name="creation_date_label" value="Erstellungsdatum:"/>
+					<text_editor name="creation_date" tool_tip="Erstellungsdatum" value="[date]"/>
+					<text name="price_for_listing_label" value="Preis für Auflistung:"/>
+					<text_editor name="price_for_listing" tool_tip="Preis für Auflistung.">
+						[PRICE]
+					</text_editor>
+				</layout_panel>
+				<layout_panel name="clickthrough_layout_panel">
+					<text name="click_through_label" value="Klicks:"/>
+					<text_editor name="click_through_text" tool_tip="Click-Through-Daten" value="[clicks]"/>
+				</layout_panel>
+				<layout_panel name="auto_renew_layout_panel">
+					<text name="auto_renew_label" value="Autom. erneuern:"/>
+					<text name="auto_renew" value="Aktiviert"/>
+				</layout_panel>
+				<layout_panel name="descr_layout_panel">
+					<text name="classified_desc_label" value="Beschreibung:"/>
+					<text_editor name="classified_desc" value="[description]"/>
+				</layout_panel>
+			</layout_stack>
+			<panel name="edit_panel">
+				<text name="Name:">
+					Titel:
+				</text>
+				<text name="description_label">
+					Beschreibung:
+				</text>
+				<text name="location_label">
+					Standort:
+				</text>
+				<text name="classified_location_edit">
+					Laden...
+				</text>
+				<button label="Aktuellen Standort verwenden" name="set_to_curr_location_btn"/>
+				<text name="category_label" value="Kategorie:"/>
+				<text name="content_type_label" value="Inhaltsart:"/>
+				<icons_combo_box label="Generelle Inhalte" name="content_type_edit">
+					<icons_combo_box.item label="Moderate Inhalte" name="mature_ci" value="Adult"/>
+					<icons_combo_box.item label="Generelle Inhalte" name="pg_ci" value="PG"/>
+				</icons_combo_box>
+				<check_box label="Jede Woche automatisch erneuern" name="auto_renew_edit"/>
+				<text name="price_for_listing_edit_label" value="Preis für Auflistung:"/>
+				<spinner label="L$" name="price_for_listing_edit" tool_tip="Preis für Auflistung." value="50"/>
+			</panel>
+		</panel>
+	</scroll_container>
+	<layout_stack name="edit_btns_pnl">
+		<layout_panel name="teleport_btn_lp">
+			<button label="Teleportieren" name="teleport_btn"/>
+		</layout_panel>
+		<layout_panel name="map_btn_lp">
+			<button label="Karte" name="show_on_map_btn"/>
+		</layout_panel>
+		<layout_panel name="edit_btn_lp">
+			<button label="Bearbeiten" name="edit_btn"/>
+		</layout_panel>
+		<layout_panel name="save_btn_lp">
+			<button label="[LABEL]" name="save_changes_btn"/>
+		</layout_panel>
+		<layout_panel name="cancel_btn_lp">
+			<button label="Abbrechen" name="cancel_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/de/panel_profile_classifieds.xml
new file mode 100644
index 0000000000..83549cb138
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_profile_classifieds.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Anzeige" name="panel_profile_classifieds">
+	<string name="no_classifieds" value="Keine Anzeigen"/>
+	<button label="Neu..." name="new_btn"/>
+	<button label="Löschen..." name="delete_btn"/>
+	<text name="classifieds_panel_text">
+		Laden...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/de/panel_profile_firstlife.xml
new file mode 100644
index 0000000000..0f65090209
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_profile_firstlife.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Profil" name="panel_profile_firstlife"/>
diff --git a/indra/newview/skins/default/xui/de/panel_profile_interests.xml b/indra/newview/skins/default/xui/de/panel_profile_interests.xml
new file mode 100644
index 0000000000..0f36f76aa0
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_profile_interests.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Interessen" name="panel_profile_interests">
+	<text name="I Want To:">
+		Ich möchte:
+	</text>
+	<check_box label="Erstellen" name="chk0"/>
+	<check_box label="Erkunden" name="chk1"/>
+	<check_box label="Treffen" name="chk2"/>
+	<check_box label="Angestellt werden" name="chk6"/>
+	<check_box label="Gruppe" name="chk3"/>
+	<check_box label="Kaufen" name="chk4"/>
+	<check_box label="Verkaufen" name="chk5"/>
+	<check_box label="Anstellen" name="chk7"/>
+	<line_editor name="want_to_edit">
+		(wird geladen...)
+	</line_editor>
+	<text name="Skills:">
+		Fähigkeiten:
+	</text>
+	<check_box label="Texturen" name="schk0"/>
+	<check_box label="Architektur" name="schk1"/>
+	<check_box label="Modellierung" name="schk3"/>
+	<check_box label="Eventplanung" name="schk2"/>
+	<check_box label="Scripting" name="schk4"/>
+	<check_box label="Benutzerdefinierte Charaktere" name="schk5"/>
+	<line_editor name="skills_edit">
+		(wird geladen...)
+	</line_editor>
+	<text name="Languages:">
+		Sprachen:
+	</text>
+	<line_editor name="languages_edit">
+		(wird geladen...)
+	</line_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_profile_notes.xml b/indra/newview/skins/default/xui/de/panel_profile_notes.xml
new file mode 100644
index 0000000000..05c46ff858
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_profile_notes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Anmerkungen &amp; Privatsphäre" name="panel_notes">
+	<text name="status_message" value="Private Anmerkungen zu diesem Avatar:"/>
+	<text name="status_message2" value="Dieser Avatar darf:"/>
+	<check_box label="Sehen, wenn ich online bin" name="status_check"/>
+	<check_box label="Mich auf der Weltkarte sehen" name="map_check"/>
+	<check_box label="Meine Objekte bearbeiten, löschen oder nehmen" name="objects_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_profile_pick.xml b/indra/newview/skins/default/xui/de/panel_profile_pick.xml
new file mode 100644
index 0000000000..1f44ba8b1b
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_profile_pick.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_pick_info">
+	<panel.string name="location_notice">
+		(wird nach dem Speichern aktualisiert)
+	</panel.string>
+	<line_editor name="pick_location">
+		Laden...
+	</line_editor>
+	<button label="Teleportieren" name="teleport_btn"/>
+	<button label="Auf Karte anzeigen" name="show_on_map_btn"/>
+	<button label="Standort festlegen" name="set_to_curr_location_btn" tool_tip="Aktuellen Standort verwenden"/>
+	<button label="Auswahl speichern" name="save_changes_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_profile_picks.xml b/indra/newview/skins/default/xui/de/panel_profile_picks.xml
new file mode 100644
index 0000000000..96403715e4
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_profile_picks.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Auswahlen" name="panel_picks">
+	<string name="no_picks" value="Keine Auswahl"/>
+	<text name="Tell everyone about your favorite places in Second Life.">
+		Erzählen Sie von Ihren Lieblingsorten in Second Life.
+	</text>
+	<button label="Neu..." name="new_btn"/>
+	<button label="Löschen..." name="delete_btn"/>
+	<text name="picks_panel_text">
+		Laden...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/de/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..baaa58e1d7
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_profile_secondlife.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Profil" name="panel_profile">
+	<string name="status_online">
+		Zurzeit online
+	</string>
+	<string name="status_offline">
+		Zurzeit offline
+	</string>
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO]
+	</string>
+	<string name="payment_update_link_url">
+		http://www.secondlife.com/account/billing.php?lang=de
+	</string>
+	<string name="partner_edit_link_url">
+		http://www.secondlife.com/account/partners.php?lang=de
+	</string>
+	<string name="my_account_link_url" value="http://secondlife.com/account"/>
+	<string name="no_partner_text" value="Keine"/>
+	<string name="no_group_text" value="Keine"/>
+	<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="Entwickler"/>
+	<string name="FSSupp" value="Support"/>
+	<string name="FSQualityAssurance" value="Fehlersuche"/>
+	<string name="FSGW" value="Gateway"/>
+	<text name="name_label" value="Name:"/>
+	<button label="Name:" name="set_name" tool_tip="Anzeigenamen festlegen"/>
+	<panel name="name_holder">
+		<text_editor name="complete_name" value="(wird geladen...)"/>
+	</panel>
+	<layout_stack name="imagepositioner">
+		<layout_panel name="label_stack">
+			<text name="status" value="Status unbekannt"/>
+			<text name="label" value="Second Life-Geburtsdatum:"/>
+			<text name="label2" value="Konto:"/>
+			<text name="partner_label" value="Partner:"/>
+		</layout_panel>
+	</layout_stack>
+	<text name="Groups:" value="Gruppen:"/>
+	<button label="+" label_selected="+" name="group_invite" tool_tip="In Gruppe einladen"/>
+	<layout_stack name="aboutpositioner">
+		<layout_panel name="about_stack">
+			<text name="About:" value="Info:"/>
+		</layout_panel>
+		<layout_panel name="give_stack">
+			<text name="Give item:" value="Objekt geben:"/>
+			<text name="Give inventory" tool_tip="Legen Sie hier Inventarobjekte ab, um Sie dieser Person zu geben.">
+				Inventarobjekt hier ablegen.
+			</text>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack name="buttonstack">
+		<layout_panel name="left_buttonstack">
+			<button label="Auf Karte anzeigen" label_selected="Auf Karte anzeigen" name="show_on_map_btn" tool_tip="Einwohner auf Karte lokalisieren"/>
+			<button label="Bezahlen" label_selected="Bezahlen" name="pay" tool_tip="Geld an den Einwohner zahlen"/>
+		</layout_panel>
+		<layout_panel name="middle_buttonstack">
+			<button label="Teleportation anbieten" label_selected="Teleportation anbieten" name="teleport" tool_tip="Dem Einwohner eine Teleportation anbieten"/>
+			<button label="Instant Message" label_selected="Instant Message" name="im" tool_tip="Instant Message-Sitzung öffnen"/>
+		</layout_panel>
+		<layout_panel name="right_buttonstack">
+			<button label="Freund hinzufügen" label_selected="Freund hinzufügen" name="add_friend" tool_tip="Dem Einwohner die Freundschaft anbieten"/>
+			<button label="Blockieren" name="block" tool_tip="Diesen Einwohner blockieren"/>
+			<button label="Blockierung aufheben" name="unblock" tool_tip="Diesen Einwohner nicht mehr blockieren"/>
+		</layout_panel>
+	</layout_stack>
+	<check_box label="In Suche anzeigen" name="show_in_search_checkbox"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_profile_web.xml b/indra/newview/skins/default/xui/de/panel_profile_web.xml
new file mode 100644
index 0000000000..a03918f4b5
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_profile_web.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Web" name="panel_profile_web">
+	<panel.string name="LoadTime" value="Ladezeit: [TIME] Sekunden"/>
+	<line_editor name="url_edit">
+		(wird geladen..)
+	</line_editor>
+	<flyout_button label="Laden" name="load" tool_tip="Lädt diese Profilseite im integrierten Webbrowser.">
+		<flyout_button.item label="Im Viewer-Browser öffnen" name="open_item"/>
+		<flyout_button.item label="In externem Browser öffnen" name="home_item"/>
+	</flyout_button>
+	<button name="web_profile_popout_btn" tool_tip="Webprofil ausklappen"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 95eb88614b..510e6e708b 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -357,6 +357,24 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="TestingDisconnect">
 		Verbindungsabbruch wird getestet
 	</string>
+	<string name="SocialFacebookConnecting">
+		Mit Facebook verbinden...
+	</string>
+	<string name="SocialFacebookPosting">
+		Posten...
+	</string>
+	<string name="SocialFacebookDisconnecting">
+		Facebook-Verbindung trennen...
+	</string>
+	<string name="SocialFacebookErrorConnecting">
+		Problem beim Verbinden mit Facebook
+	</string>
+	<string name="SocialFacebookErrorPosting">
+		Problem beim Posten auf Facebook
+	</string>
+	<string name="SocialFacebookErrorDisconnecting">
+		Problem beim Trennen der Facebook-Verbindung
+	</string>
 	<string name="SocialFlickrConnecting">
 		Verbinden mit Flickr...
 	</string>
@@ -2510,9 +2528,21 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich unter http://suppo
 	<string name="NoPicksClassifiedsText">
 		Sie haben keine Auswahl oder Anzeigen erstelllt. Klicken Sie auf die „Plus&quot;-Schaltfläche, um eine Auswahl oder Anzeige zu erstellen.
 	</string>
+	<string name="NoPicksText">
+		Sie haben keine Auswahl erstellt. Klicken Sie auf die Schaltfläche &quot;Neu&quot;, um eine Auswahl zu erstellen.
+	</string>
+	<string name="NoClassifiedsText">
+		Sie haben keine Anzeigen erstellt. Klicken Sie auf die Schaltfläche &quot;Neu&quot;, um eine Anzeige zu erstellen.
+	</string>
 	<string name="NoAvatarPicksClassifiedsText">
 		Der Einwohner hat keine Auswahl oder Anzeigen
 	</string>
+	<string name="NoAvatarPicksText">
+		Der Einwohner hat keine Auswahl
+	</string>
+	<string name="NoAvatarClassifiedsText">
+		Der Einwohner hat keine Anzeigen
+	</string>
 	<string name="PicksClassifiedsLoadingText">
 		Wird geladen...
 	</string>
@@ -4490,6 +4520,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="share_alert">
 		Objekte aus dem Inventar hier her ziehen
 	</string>
+	<string name="facebook_post_success">
+		Sie haben auf Facebook gepostet.
+	</string>
 	<string name="flickr_post_success">
 		Sie haben auf Flickr gepostet.
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
index 5698e39bee..b69307c2cd 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
@@ -6,7 +6,7 @@
 	<check_box label="Gestos" name="check_gesture"/>
 	<check_box label="Hitos" name="check_landmark"/>
 	<check_box label="Notas" name="check_notecard"/>
-	<check_box label="Redes" name="check_mesh"/>
+	<check_box label="Meshs" name="check_mesh"/>
 	<check_box label="Objetos" name="check_object"/>
 	<check_box label="Scripts" name="check_script"/>
 	<check_box label="Sonidos" name="check_sound"/>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
index 4012191c78..2543508c40 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
@@ -6,42 +6,23 @@
 	<floater.string name="Copy">
 		Copiar al inventario
 	</floater.string>
-	<text name="desc txt">
-		Descripción:
-	</text>
-	<text name="dimensions">
-		[WIDTH] px x [HEIGHT] px
-	</text>
-	<text name="aspect_ratio">
-		Previsualizar la ratio de las proporciones
-	</text>
-	<combo_box name="combo_aspect_ratio" tool_tip="Vista previa en una proporción concreta">
-		<combo_item name="Unconstrained">
-			Sin restricciones
-		</combo_item>
-		<combo_item name="1:1" tool_tip="Emblema del grupo o perfil del Mundo real">
-			1:1
-		</combo_item>
-		<combo_item name="4:3" tool_tip="Perfil de [SECOND_LIFE]">
-			4:3
-		</combo_item>
-		<combo_item name="10:7" tool_tip="Clasificados (también en las listas de búsqueda), hitos">
-			10:7
-		</combo_item>
-		<combo_item name="3:2" tool_tip="Acerca del terreno">
-			3:2
-		</combo_item>
-		<combo_item name="16:10">
-			16:10
-		</combo_item>
-		<combo_item name="16:9" tool_tip="Destacados del perfil">
-			16:9
-		</combo_item>
-		<combo_item name="2:1">
-			2:1
-		</combo_item>
-	</combo_box>
-	<button label="OK" name="Keep"/>
-	<button label="Descartar" name="Discard"/>
-	<button label="Guardar como" name="save_tex_btn"/>
+	<layout_stack name="preview_stack">
+		<layout_panel name="texture_panel">
+			<text name="desc txt">
+				Descripción:
+			</text>
+			<text name="dimensions">
+				[WIDTH]px x [HEIGHT]px
+			</text>
+			<text name="aspect_ratio">
+				Previsualizar la ratio de las proporciones
+			</text>
+			<combo_box name="combo_aspect_ratio" tool_tip="Vista previa en una proporción concreta"/>
+		</layout_panel>
+		<layout_panel name="buttons_panel">
+			<button label="OK" name="Keep"/>
+			<button label="Descartar" name="Discard"/>
+			<button label="Guardar como" name="save_tex_btn"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_profile.xml b/indra/newview/skins/default/xui/es/floater_profile.xml
new file mode 100644
index 0000000000..c9448a0d4e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_profile.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarinfo" title="Perfil">
+	<panel name="panel_profile_view">
+		<tab_container name="panel_profile_tabs">
+			<panel label="Second Life" name="panel_profile_secondlife"/>
+			<panel label="Web" name="panel_profile_web"/>
+			<panel label="Intereses" name="panel_profile_interests"/>
+			<panel label="Destacados" name="panel_profile_picks"/>
+			<panel label="Clasificado" name="panel_profile_classifieds"/>
+			<panel label="Vida real" name="panel_profile_firstlife"/>
+			<panel label="Notas" name="panel_profile_notes"/>
+		</tab_container>
+		<button label="OK" name="ok_btn" tool_tip="Salvar cambios en el perfil y cerrar"/>
+		<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_snapshot.xml b/indra/newview/skins/default/xui/es/floater_snapshot.xml
index c2c996aa8a..2dfaecf3e3 100644
--- a/indra/newview/skins/default/xui/es/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/es/floater_snapshot.xml
@@ -6,6 +6,9 @@
 	<string name="postcard_progress_str">
 		Enviando el correo electrónico
 	</string>
+	<string name="facebook_progress_str">
+		Publicando en Facebook
+	</string>
 	<string name="profile_progress_str">
 		Publicando
 	</string>
@@ -15,6 +18,9 @@
 	<string name="local_progress_str">
 		Guardando en el equipo
 	</string>
+	<string name="facebook_succeeded_str">
+		Imagen subida
+	</string>
 	<string name="profile_succeeded_str">
 		Imagen subida
 	</string>
@@ -27,6 +33,9 @@
 	<string name="local_succeeded_str">
 		¡Guardado en el equipo!
 	</string>
+	<string name="facebook_failed_str">
+		Error al subir la imagen a tu biografía de Facebook.
+	</string>
 	<string name="profile_failed_str">
 		Error al subir la imagen a los comentarios de tu perfil.
 	</string>
diff --git a/indra/newview/skins/default/xui/es/menu_name_field.xml b/indra/newview/skins/default/xui/es/menu_name_field.xml
new file mode 100644
index 0000000000..0d51fbffeb
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_name_field.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="CopyMenu">
+	<menu_item_call label="Copiar Nombre mostrado" name="copy_display"/>
+	<menu_item_call label="Copiar Nombre de agente" name="copy_name"/>
+	<menu_item_call label="Copiar ID de agente" name="copy_id"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index eac09b767b..763fab72da 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -2667,6 +2667,9 @@ Inténtalo seleccionando un trozo más pequeño de terreno.
 	<notification name="SystemMessage">
 		[MESSAGE]
 	</notification>
+	<notification name="FacebookConnect">
+		[MESSAGE]
+	</notification>
 	<notification name="FlickrConnect">
 		[MESSAGE]
 	</notification>
diff --git a/indra/newview/skins/default/xui/es/panel_edit_classified.xml b/indra/newview/skins/default/xui/es/panel_edit_classified.xml
index ffad843732..09f87015cc 100644
--- a/indra/newview/skins/default/xui/es/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_classified.xml
@@ -46,7 +46,7 @@
 			<layout_panel name="save_changes_btn_lp">
 				<button label="[LABEL]" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="show_on_map_btn_lp">
+			<layout_panel name="cancel_btn_lp">
 				<button label="Cancelar" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_place.xml b/indra/newview/skins/default/xui/es/panel_facebook_place.xml
index 5139bd1d0b..29f6147f23 100644
--- a/indra/newview/skins/default/xui/es/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/es/panel_facebook_place.xml
@@ -3,7 +3,7 @@
 	<text name="place_caption_label">
 		Cuenta algo del lugar donde te encuentras:
 	</text>
-	<check_box initial_value="false" label="Incluir una vista general del lugar" name="add_place_view_cb"/>
+	<check_box initial_value="false" label="Incluye una vista general del lugar" name="add_place_view_cb"/>
 	<button label="Publicar" name="post_place_btn"/>
 	<button label="Cancelar" name="cancel_place_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml
index b00c300c85..ef919f396e 100644
--- a/indra/newview/skins/default/xui/es/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_general.xml
@@ -46,7 +46,7 @@ Deja el cursor sobre las opciones para ver más ayuda.
 		<check_box label="Cualquiera puede entrar" name="open_enrollement" tool_tip="Configura si se permite la entrada de nuevos miembros sin ser invitados."/>
 		<check_box label="Cuota de entrada" name="check_enrollment_fee" tool_tip="Configura si hay que pagar una cuota para entrar al grupo"/>
 		<spinner label="L$" left_delta="130" name="spin_enrollment_fee" tool_tip="Si la opción Cuota de entrada está marcada, los nuevos miembros han de pagar esta cuota para entrar al grupo." width="60"/>
-		<combo_box bottom_delta="-38" name="group_mature_check" tool_tip="Establece si la información de su grupo es moderado." width="150">
+		<combo_box bottom_delta="-38" name="group_mature_check" tool_tip="Establece si tu grupo contiene información clasificada como Moderada" width="150">
 			<combo_item name="select_mature">
 				- Selecciona el nivel de calificación -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/es/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/es/panel_group_list_item_short.xml
new file mode 100644
index 0000000000..4d682068d7
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_group_list_item_short.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="group_list_item">
+	<text name="group_name" value="Desconocido"/>
+	<button name="info_btn" tool_tip="Más información"/>
+	<button name="profile_btn" tool_tip="Ver el perfil"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 909743c325..801bc86473 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -40,6 +40,7 @@
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Conectado"/>
 				<accordion_tab name="tab_all" title="Todos"/>
+				<accordion_tab name="tab_suggested_friends" title="Personas de las que podrías querer ser amigo"/>
 			</accordion>
 		</panel>
 		<panel label="GRUPOS" name="groups_panel">
diff --git a/indra/newview/skins/default/xui/es/panel_profile_classified.xml b/indra/newview/skins/default/xui/es/panel_profile_classified.xml
new file mode 100644
index 0000000000..679026d350
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_profile_classified.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_profile_classified">
+	<panel.string name="type_mature">
+		Moderado
+	</panel.string>
+	<panel.string name="type_pg">
+		Contenido general
+	</panel.string>
+	<panel.string name="l$_price">
+		L$[PRICE]
+	</panel.string>
+	<panel.string name="click_through_text_fmt">
+		[TELEPORT] teleportes, [MAP] mapa, [PROFILE] perfil
+	</panel.string>
+	<panel.string name="date_fmt">
+		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+	</panel.string>
+	<panel.string name="auto_renew_on">
+		Activados
+	</panel.string>
+	<panel.string name="auto_renew_off">
+		Inhabilitado
+	</panel.string>
+	<panel.string name="location_notice">
+		(se actualizará tras guardarlo)
+	</panel.string>
+	<string name="publish_label">
+		Publicar
+	</string>
+	<string name="save_label">
+		Guardar
+	</string>
+	<scroll_container name="profile_scroll">
+		<panel name="info_scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="Pulsa para elegir una imagen"/>
+			<layout_stack name="info_panel">
+				<layout_panel name="main_info_panel">
+					<text_editor name="classified_name">
+						[name]
+					</text_editor>
+					<text name="classified_location_label" value="Ubicación:"/>
+					<text_editor name="classified_location" value="[loading...]"/>
+					<text name="content_type_label" value="Tipo de contenido:"/>
+					<text_editor name="content_type" value="[content type]"/>
+					<text name="category_label" value="Categoría:"/>
+					<text_editor name="category" value="[category]"/>
+					<text name="creation_date_label" value="Fecha de creación:"/>
+					<text_editor name="creation_date" tool_tip="Fecha de creación" value="[date]"/>
+					<text name="price_for_listing_label" value="Precio por publicarlo:"/>
+					<text_editor name="price_for_listing" tool_tip="Precio por publicarlo.">
+						[PRICE]
+					</text_editor>
+				</layout_panel>
+				<layout_panel name="clickthrough_layout_panel">
+					<text name="click_through_label" value="Clics:"/>
+					<text_editor name="click_through_text" tool_tip="Información sobre Click through" value="[clicks]"/>
+				</layout_panel>
+				<layout_panel name="auto_renew_layout_panel">
+					<text name="auto_renew_label" value="Renovación:"/>
+					<text name="auto_renew" value="Activados"/>
+				</layout_panel>
+				<layout_panel name="descr_layout_panel">
+					<text name="classified_desc_label" value="Descripción:"/>
+					<text_editor name="classified_desc" value="[description]"/>
+				</layout_panel>
+			</layout_stack>
+			<panel name="edit_panel">
+				<text name="Name:">
+					Título:
+				</text>
+				<text name="description_label">
+					Descripción:
+				</text>
+				<text name="location_label">
+					Ubicación:
+				</text>
+				<text name="classified_location_edit">
+					cargando...
+				</text>
+				<button label="Configurar en mi posición" name="set_to_curr_location_btn"/>
+				<text name="category_label" value="Categoría:"/>
+				<text name="content_type_label" value="Tipo de contenido:"/>
+				<icons_combo_box label="Contenido general" name="content_type_edit">
+					<icons_combo_box.item label="Contenido Moderado" name="mature_ci" value="Contenido para adultos"/>
+					<icons_combo_box.item label="Contenido general" name="pg_ci" value="General"/>
+				</icons_combo_box>
+				<check_box label="Renovar automáticamente cada semana" name="auto_renew_edit"/>
+				<text name="price_for_listing_edit_label" value="Precio por publicarlo:"/>
+				<spinner label="L$" name="price_for_listing_edit" tool_tip="Precio por publicarlo." value="50"/>
+			</panel>
+		</panel>
+	</scroll_container>
+	<layout_stack name="edit_btns_pnl">
+		<layout_panel name="teleport_btn_lp">
+			<button label="Teleporte" name="teleport_btn"/>
+		</layout_panel>
+		<layout_panel name="map_btn_lp">
+			<button label="Mapa" name="show_on_map_btn"/>
+		</layout_panel>
+		<layout_panel name="edit_btn_lp">
+			<button label="Editar" name="edit_btn"/>
+		</layout_panel>
+		<layout_panel name="save_btn_lp">
+			<button label="[LABEL]" name="save_changes_btn"/>
+		</layout_panel>
+		<layout_panel name="cancel_btn_lp">
+			<button label="Cancelar" name="cancel_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/es/panel_profile_classifieds.xml
new file mode 100644
index 0000000000..2520348094
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_profile_classifieds.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Clasificado" name="panel_profile_classifieds">
+	<string name="no_classifieds" value="No hay clasificados"/>
+	<button label="Nuevo..." name="new_btn"/>
+	<button label="Eliminar..." name="delete_btn"/>
+	<text name="classifieds_panel_text">
+		Cargando...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/es/panel_profile_firstlife.xml
new file mode 100644
index 0000000000..0fb502e441
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_profile_firstlife.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Perfil" name="panel_profile_firstlife"/>
diff --git a/indra/newview/skins/default/xui/es/panel_profile_interests.xml b/indra/newview/skins/default/xui/es/panel_profile_interests.xml
new file mode 100644
index 0000000000..86dd63390c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_profile_interests.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Intereses" name="panel_profile_interests">
+	<text name="I Want To:">
+		Quiero:
+	</text>
+	<check_box label="Construye" name="chk0"/>
+	<check_box label="Explora" name="chk1"/>
+	<check_box label="Conoce" name="chk2"/>
+	<check_box label="Encuentra empleo" name="chk6"/>
+	<check_box label="Agrupa" name="chk3"/>
+	<check_box label="Compra" name="chk4"/>
+	<check_box label="Vende" name="chk5"/>
+	<check_box label="Contrata" name="chk7"/>
+	<line_editor name="want_to_edit">
+		(cargando...)
+	</line_editor>
+	<text name="Skills:">
+		Habilidades:
+	</text>
+	<check_box label="Texturas" name="schk0"/>
+	<check_box label="Arquitectura" name="schk1"/>
+	<check_box label="Modelo" name="schk3"/>
+	<check_box label="Planificación de eventos" name="schk2"/>
+	<check_box label="Preparación de scripts" name="schk4"/>
+	<check_box label="Personajes personalizados" name="schk5"/>
+	<line_editor name="skills_edit">
+		(cargando...)
+	</line_editor>
+	<text name="Languages:">
+		Idiomas:
+	</text>
+	<line_editor name="languages_edit">
+		(cargando...)
+	</line_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_profile_notes.xml b/indra/newview/skins/default/xui/es/panel_profile_notes.xml
new file mode 100644
index 0000000000..4cc14e1487
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_profile_notes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Notas y Privacidad" name="panel_notes">
+	<text name="status_message" value="Notas privadas en este avatar:"/>
+	<text name="status_message2" value="Permitir que este avatar:"/>
+	<check_box label="Ver cuándo estoy conectado" name="status_check"/>
+	<check_box label="Encontrarme en el mapa del mundo" name="map_check"/>
+	<check_box label="Edita, borrar o tomar mis objetos" name="objects_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_profile_pick.xml b/indra/newview/skins/default/xui/es/panel_profile_pick.xml
new file mode 100644
index 0000000000..4e9f5bbdd5
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_profile_pick.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_pick_info">
+	<panel.string name="location_notice">
+		(se actualizará tras guardarlo)
+	</panel.string>
+	<line_editor name="pick_location">
+		Cargando...
+	</line_editor>
+	<button label="Teleporte" name="teleport_btn"/>
+	<button label="Mostrar en el mapa" name="show_on_map_btn"/>
+	<button label="Establecer ubicación" name="set_to_curr_location_btn" tool_tip="Configurar en mi posición"/>
+	<button label="Guardar" name="save_changes_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_profile_picks.xml b/indra/newview/skins/default/xui/es/panel_profile_picks.xml
new file mode 100644
index 0000000000..0641b72c13
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_profile_picks.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Destacados" name="panel_picks">
+	<string name="no_picks" value="No hay destacados"/>
+	<text name="Tell everyone about your favorite places in Second Life.">
+		Cuéntale a todos sobre tus lugares favoritos de Second Life.
+	</text>
+	<button label="Nuevo..." name="new_btn"/>
+	<button label="Eliminar..." name="delete_btn"/>
+	<text name="picks_panel_text">
+		Cargando...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/es/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..541593660d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_profile_secondlife.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Perfil" name="panel_profile">
+	<string name="status_online">
+		Actualmente en línea
+	</string>
+	<string name="status_offline">
+		Actualmente sin conexión
+	</string>
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO]
+	</string>
+	<string name="payment_update_link_url">
+		http://www.secondlife.com/account/billing.php?lang=en
+	</string>
+	<string name="partner_edit_link_url">
+		http://www.secondlife.com/account/partners.php?lang=en
+	</string>
+	<string name="my_account_link_url" value="http://secondlife.com/account"/>
+	<string name="no_partner_text" value="Ninguno"/>
+	<string name="no_group_text" value="Ninguno"/>
+	<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="Desarrollador"/>
+	<string name="FSSupp" value="Soporte"/>
+	<string name="FSQualityAssurance" value="Buscador de fallos"/>
+	<string name="FSGW" value="Portal"/>
+	<text name="name_label" value="Nombre:"/>
+	<button label="Nombre:" name="set_name" tool_tip="Configurar nombre mostrado"/>
+	<panel name="name_holder">
+		<text_editor name="complete_name" value="(cargando...)"/>
+	</panel>
+	<layout_stack name="imagepositioner">
+		<layout_panel name="label_stack">
+			<text name="status" value="Status Desconocido"/>
+			<text name="label" value="Fecha de nacimiento en Second Life:"/>
+			<text name="label2" value="Cuenta:"/>
+			<text name="partner_label" value="Compañero/a:"/>
+		</layout_panel>
+	</layout_stack>
+	<text name="Groups:" value="Grupos:"/>
+	<button label="+" label_selected="+" name="group_invite" tool_tip="Invitar al grupo"/>
+	<layout_stack name="aboutpositioner">
+		<layout_panel name="about_stack">
+			<text name="About:" value="Acerca de:"/>
+		</layout_panel>
+		<layout_panel name="give_stack">
+			<text name="Give item:" value="Dar objeto:"/>
+			<text name="Give inventory" tool_tip="Soltar elementos de inventario aquí para dárselos a esta persona.">
+				Soltar aquí el nuevo elemento de inventario.
+			</text>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack name="buttonstack">
+		<layout_panel name="left_buttonstack">
+			<button label="Encontrar en el mapa" label_selected="Encontrar en el mapa" name="show_on_map_btn" tool_tip="Mostrar al Residente en el mapa"/>
+			<button label="Pagar" label_selected="Pagar" name="pay" tool_tip="Pagar a este Residente"/>
+		</layout_panel>
+		<layout_panel name="middle_buttonstack">
+			<button label="Ofrecer teleporte" label_selected="Ofrecer teleporte" name="teleport" tool_tip="Ofrecer teleporte al residente"/>
+			<button label="Mensaje instantáneo" label_selected="Mensaje instantáneo" name="im" tool_tip="Abrir una sesión de mensajes instantáneos"/>
+		</layout_panel>
+		<layout_panel name="right_buttonstack">
+			<button label="Añadir como amigo" label_selected="Añadir como amigo" name="add_friend" tool_tip="Ofrecer amistad a este Residente"/>
+			<button label="Bloquear" name="block" tool_tip="Bloquear al residente"/>
+			<button label="Desbloquear" name="unblock" tool_tip="Desbloquear al residente"/>
+		</layout_panel>
+	</layout_stack>
+	<check_box label="Mostrar en la búsqueda" name="show_in_search_checkbox"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_profile_web.xml b/indra/newview/skins/default/xui/es/panel_profile_web.xml
new file mode 100644
index 0000000000..f9a8f4b113
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_profile_web.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Web" name="panel_profile_web">
+	<panel.string name="LoadTime" value="Tiempo de carga: [TIME] segundos"/>
+	<line_editor name="url_edit">
+		(cargando..)
+	</line_editor>
+	<flyout_button label="Cargar" name="load" tool_tip="Cargar esta página de perfil con el navegador incorporado.">
+		<flyout_button.item label="Abrir navegador in-viewer" name="open_item"/>
+		<flyout_button.item label="Abrir navegador externo" name="home_item"/>
+	</flyout_button>
+	<button name="web_profile_popout_btn" tool_tip="Perfil web emergente"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 1b06675670..ba63e5d883 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -349,6 +349,24 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="TestingDisconnect">
 		Probando la desconexión del visor
 	</string>
+	<string name="SocialFacebookConnecting">
+		Conectando con Facebook...
+	</string>
+	<string name="SocialFacebookPosting">
+		Publicando...
+	</string>
+	<string name="SocialFacebookDisconnecting">
+		Desconectando de Facebook...
+	</string>
+	<string name="SocialFacebookErrorConnecting">
+		Problema al conectar con Facebook
+	</string>
+	<string name="SocialFacebookErrorPosting">
+		Problema al publicar en Facebook
+	</string>
+	<string name="SocialFacebookErrorDisconnecting">
+		Problema al desconectar de Facebook
+	</string>
 	<string name="SocialFlickrConnecting">
 		Conectándose a Flickr...
 	</string>
@@ -2481,9 +2499,21 @@ Si sigues recibiendo el mismo mensaje, solicita ayuda al personal de asistencia
 	<string name="NoPicksClassifiedsText">
 		No has creado destacados ni clasificados. Pulsa el botón Más para crear uno.
 	</string>
+	<string name="NoPicksText">
+		No has creado destacados. Haz clic en el botón Más para crear uno.
+	</string>
+	<string name="NoClassifiedsText">
+		No has creado clasificados. Haz clic en el botón Nuevo para crear un anuncio clasificado.
+	</string>
 	<string name="NoAvatarPicksClassifiedsText">
 		El usuario no tiene clasificados ni destacados
 	</string>
+	<string name="NoAvatarPicksText">
+		El usuario no tiene destacados
+	</string>
+	<string name="NoAvatarClassifiedsText">
+		El usuario no tiene clasificados
+	</string>
 	<string name="PicksClassifiedsLoadingText">
 		Cargando...
 	</string>
@@ -4401,6 +4431,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="share_alert">
 		Arrastra los ítems desde el invenbtario hasta aquí
 	</string>
+	<string name="facebook_post_success">
+		Has publicado en Facebook.
+	</string>
 	<string name="flickr_post_success">
 		Has publicado en Flickr.
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index 42d7709c99..71b5a391e6 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -358,7 +358,7 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/>
 			<text name="allow_label5">
-				Les avatars sur d&apos;autres parcelles peuvent voir et chatter avec les avatars sur cette parcelle.
+				Les avatars sur d&apos;autres parcelles peuvent voir et chatter avec les avatars sur cette parcelle
 			</text>
 			<check_box label="Voir les avatars" name="SeeAvatarsCheck" tool_tip="Permettre aux avatars présents sur d&apos;autres parcelles de voir et chatter avec les avatars présents sur cette parcelle et à vous de les voir et de chatter avec eux."/>
 			<text name="landing_point">
diff --git a/indra/newview/skins/default/xui/fr/floater_facebook.xml b/indra/newview/skins/default/xui/fr/floater_facebook.xml
index f5097e7a88..f6e8696e53 100644
--- a/indra/newview/skins/default/xui/fr/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/fr/floater_facebook.xml
@@ -10,6 +10,6 @@
 		Erreur
 	</text>
 	<text name="connection_loading_text">
-		Chargement...
+		En cours de chargement...
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
index 9fc9d14026..46703fe612 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
@@ -6,42 +6,23 @@
 	<floater.string name="Copy">
 		Copier dans l&apos;inventaire
 	</floater.string>
-	<text name="desc txt">
-		Description :
-	</text>
-	<text name="dimensions">
-		[WIDTH] px x [HEIGHT] px
-	</text>
-	<text name="aspect_ratio">
-		Aperçu du rapport hauteur/largeur
-	</text>
-	<combo_box name="combo_aspect_ratio" tool_tip="Aperçu avec un rapport hauteur/largeur fixe">
-		<combo_item name="Unconstrained">
-			Sans contraintes
-		</combo_item>
-		<combo_item name="1:1" tool_tip="Logo du groupe ou profil dans la vie réelle">
-			1:1
-		</combo_item>
-		<combo_item name="4:3" tool_tip="Profil [SECOND_LIFE]">
-			4:3
-		</combo_item>
-		<combo_item name="10:7" tool_tip="Petites annonces, repères">
-			10:7
-		</combo_item>
-		<combo_item name="3:2" tool_tip="À propos du terrain">
-			3:2
-		</combo_item>
-		<combo_item name="16:10">
-			16:10
-		</combo_item>
-		<combo_item name="16:9" tool_tip="Favoris du profil">
-			16:9
-		</combo_item>
-		<combo_item name="2:1">
-			2:1
-		</combo_item>
-	</combo_box>
-	<button label="OK" name="Keep"/>
-	<button label="Jeter" name="Discard"/>
-	<button label="Enregistrer sous" name="save_tex_btn"/>
+	<layout_stack name="preview_stack">
+		<layout_panel name="texture_panel">
+			<text name="desc txt">
+				Description :
+			</text>
+			<text name="dimensions">
+				[WIDTH]px x [HEIGHT]px
+			</text>
+			<text name="aspect_ratio">
+				Rapport d&apos;aspect fixe
+			</text>
+			<combo_box name="combo_aspect_ratio" tool_tip="Prévisualiser avec un rapport d&apos;aspect fixe"/>
+		</layout_panel>
+		<layout_panel name="buttons_panel">
+			<button label="OK" name="Keep"/>
+			<button label="Jeter" name="Discard"/>
+			<button label="Enregistrer sous" name="save_tex_btn"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_profile.xml b/indra/newview/skins/default/xui/fr/floater_profile.xml
new file mode 100644
index 0000000000..c4af79e946
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_profile.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarinfo" title="Profil">
+	<panel name="panel_profile_view">
+		<tab_container name="panel_profile_tabs">
+			<panel label="Second Life" name="panel_profile_secondlife"/>
+			<panel label="Web" name="panel_profile_web"/>
+			<panel label="Centres d&apos;intérêt" name="panel_profile_interests"/>
+			<panel label="Favoris" name="panel_profile_picks"/>
+			<panel label="Petite annonce" name="panel_profile_classifieds"/>
+			<panel label="Vie réelle" name="panel_profile_firstlife"/>
+			<panel label="Remarques" name="panel_profile_notes"/>
+		</tab_container>
+		<button label="OK" name="ok_btn" tool_tip="Enregistrer les changements apportés au profil et fermer"/>
+		<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index 8eb05dd945..adb98a68d2 100644
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -6,6 +6,9 @@
 	<string name="postcard_progress_str">
 		Envoi par e-mail
 	</string>
+	<string name="facebook_progress_str">
+		Publication sur Facebook
+	</string>
 	<string name="profile_progress_str">
 		Publication
 	</string>
@@ -15,6 +18,9 @@
 	<string name="local_progress_str">
 		Enregistrement sur l&apos;ordinateur
 	</string>
+	<string name="facebook_succeeded_str">
+		Image chargée
+	</string>
 	<string name="profile_succeeded_str">
 		Image chargée
 	</string>
@@ -27,6 +33,9 @@
 	<string name="local_succeeded_str">
 		Enregistrement sur l&apos;ordinateur effectué !
 	</string>
+	<string name="facebook_failed_str">
+		Échec de chargement de l&apos;image dans votre journal Facebook.
+	</string>
 	<string name="profile_failed_str">
 		Échec de chargement de l&apos;image sur le flux de votre profil.
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/menu_name_field.xml b/indra/newview/skins/default/xui/fr/menu_name_field.xml
new file mode 100644
index 0000000000..6c3fba4110
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_name_field.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="CopyMenu">
+	<menu_item_call label="Copier le Nom d&apos;affichage" name="copy_display"/>
+	<menu_item_call label="Copier le  Nom de l&apos;agent" name="copy_name"/>
+	<menu_item_call label="Copier l&apos;ID de l&apos;agent" name="copy_id"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 3ac2cfb69b..0067bdc4bd 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -2660,6 +2660,9 @@ Veuillez sélectionner un terrain plus petit.
 	<notification name="SystemMessage">
 		[MESSAGE]
 	</notification>
+	<notification name="FacebookConnect">
+		[MESSAGE]
+	</notification>
 	<notification name="FlickrConnect">
 		[MESSAGE]
 	</notification>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml
index 7b58f2e825..b892d25f26 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml
@@ -46,7 +46,7 @@
 			<layout_panel name="save_changes_btn_lp">
 				<button label="[LABEL]" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="show_on_map_btn_lp">
+			<layout_panel name="cancel_btn_lp">
 				<button label="Annuler" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/fr/panel_facebook_friends.xml b/indra/newview/skins/default/xui/fr/panel_facebook_friends.xml
index 319737a2af..0e36c2092c 100644
--- a/indra/newview/skins/default/xui/fr/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/fr/panel_facebook_friends.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_facebook_friends">
-	<string name="facebook_friends_empty" value="Vous n&apos;avez actuellement aucun ami Facebook qui est également résident de Second Life. Invitez vos amis Facebook à rejoindre Second Life !"/>
+	<string name="facebook_friends_empty" value="Vous n&apos;avez actuellement aucun ami Facebook qui est également résident de Second Life. Invitez vos amis Facebook à rejoindre Second Life aujourd&apos;hui !"/>
 	<string name="facebook_friends_no_connected" value="Vous n&apos;êtes pas connecté(e) à Facebook. Allez à l&apos;onglet Statut pour vous connecter et activer cette fonctionnalité."/>
 	<accordion name="friends_accordion">
 		<accordion_tab name="tab_second_life_friends" title="Amis SL"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_facebook_photo.xml b/indra/newview/skins/default/xui/fr/panel_facebook_photo.xml
index 3236f35b55..cc4045bc74 100644
--- a/indra/newview/skins/default/xui/fr/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/fr/panel_facebook_photo.xml
@@ -4,14 +4,14 @@
 		<combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
 		<combo_box.item label="640 x 480" name="640x480"/>
 		<combo_box.item label="800 x 600" name="800x600"/>
-		<combo_box.item label="1 024 x 768" name="1024x768"/>
-		<combo_box.item label="1 200 x 630" name="1200x630"/>
+		<combo_box.item label="1024 x 768" name="1024x768"/>
+		<combo_box.item label="1200 x 630" name="1200x630"/>
 	</combo_box>
-	<combo_box name="filters_combobox" tool_tip="Filtres d&apos;image">
+	<combo_box name="filters_combobox" tool_tip="Filtres d’image">
 		<combo_box.item label="Aucun filtre" name="NoFilter"/>
 	</combo_box>
 	<button label="Actualiser" name="new_snapshot_btn" tool_tip="Cliquer pour actualiser"/>
-	<button label="Aperçu" name="big_preview_btn" tool_tip="Cliquer pour activer/désactiver l&apos;aperçu"/>
+	<button label="Aperçu" name="big_preview_btn" tool_tip="Cliquer pour basculer l&apos;aperçu"/>
 	<text name="caption_label">
 		Commentaire (facultatif) :
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_facebook_status.xml b/indra/newview/skins/default/xui/fr/panel_facebook_status.xml
index 9afa42d2aa..dc8e4b9ecc 100644
--- a/indra/newview/skins/default/xui/fr/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/fr/panel_facebook_status.xml
@@ -6,7 +6,7 @@
 		Pas connecté(e) à Facebook.
 	</text>
 	<panel name="panel_buttons">
-		<button label="Connexion..." name="connect_btn"/>
+		<button label="Connexion en cours..." name="connect_btn"/>
 		<button label="Déconnexion" name="disconnect_btn"/>
 		<text name="account_learn_more_label">
 			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Apprenez comment publier sur Facebook]
diff --git a/indra/newview/skins/default/xui/fr/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/fr/panel_group_list_item_short.xml
new file mode 100644
index 0000000000..b1b32af7c6
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_group_list_item_short.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="group_list_item">
+	<text name="group_name" value="Inconnu"/>
+	<button name="info_btn" tool_tip="En savoir plus"/>
+	<button name="profile_btn" tool_tip="Voir le profil"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index 95cd13eb94..784708be40 100644
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -40,6 +40,7 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife://
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="En ligne"/>
 				<accordion_tab name="tab_all" title="Tout"/>
+				<accordion_tab name="tab_suggested_friends" title="Personnes avec lesquelles vous aimeriez peut-être devenir ami(e)"/>
 			</accordion>
 		</panel>
 		<panel label="GROUPES" name="groups_panel">
diff --git a/indra/newview/skins/default/xui/fr/panel_profile_classified.xml b/indra/newview/skins/default/xui/fr/panel_profile_classified.xml
new file mode 100644
index 0000000000..b223684c60
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_profile_classified.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_profile_classified">
+	<panel.string name="type_mature">
+		Modéré
+	</panel.string>
+	<panel.string name="type_pg">
+		Contenu Général
+	</panel.string>
+	<panel.string name="l$_price">
+		L$[PRICE]
+	</panel.string>
+	<panel.string name="click_through_text_fmt">
+		[TELEPORT] téléporter, [MAP] carte, [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">
+		Activé
+	</panel.string>
+	<panel.string name="auto_renew_off">
+		Désactivé
+	</panel.string>
+	<panel.string name="location_notice">
+		(mise à jour après enregistrement)
+	</panel.string>
+	<string name="publish_label">
+		Publier
+	</string>
+	<string name="save_label">
+		Enregistrer
+	</string>
+	<scroll_container name="profile_scroll">
+		<panel name="info_scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="Cliquer pour sélectionner une image"/>
+			<layout_stack name="info_panel">
+				<layout_panel name="main_info_panel">
+					<text_editor name="classified_name">
+						[name]
+					</text_editor>
+					<text name="classified_location_label" value="Endroit :"/>
+					<text_editor name="classified_location" value="[loading...]"/>
+					<text name="content_type_label" value="Type de contenu :"/>
+					<text_editor name="content_type" value="[content type]"/>
+					<text name="category_label" value="Catégorie :"/>
+					<text_editor name="category" value="[category]"/>
+					<text name="creation_date_label" value="Date de création :"/>
+					<text_editor name="creation_date" tool_tip="Date de création" value="[date]"/>
+					<text name="price_for_listing_label" value="Coût de l&apos;annonce :"/>
+					<text_editor name="price_for_listing" tool_tip="Coût de l’annonce.">
+						[PRICE]
+					</text_editor>
+				</layout_panel>
+				<layout_panel name="clickthrough_layout_panel">
+					<text name="click_through_label" value="Clics :"/>
+					<text_editor name="click_through_text" tool_tip="Parcourir les données en cliquant" value="[clicks]"/>
+				</layout_panel>
+				<layout_panel name="auto_renew_layout_panel">
+					<text name="auto_renew_label" value="Renouv. auto :"/>
+					<text name="auto_renew" value="Activé"/>
+				</layout_panel>
+				<layout_panel name="descr_layout_panel">
+					<text name="classified_desc_label" value="Description :"/>
+					<text_editor name="classified_desc" value="[description]"/>
+				</layout_panel>
+			</layout_stack>
+			<panel name="edit_panel">
+				<text name="Name:">
+					Titre :
+				</text>
+				<text name="description_label">
+					Description :
+				</text>
+				<text name="location_label">
+					Endroit :
+				</text>
+				<text name="classified_location_edit">
+					en cours de chargement...
+				</text>
+				<button label="Définir sur l’emplacement actuel" name="set_to_curr_location_btn"/>
+				<text name="category_label" value="Catégorie :"/>
+				<text name="content_type_label" value="Type de contenu :"/>
+				<icons_combo_box label="Contenu Général" name="content_type_edit">
+					<icons_combo_box.item label="Contenu Modéré" name="mature_ci" value="Adulte"/>
+					<icons_combo_box.item label="Contenu Général" name="pg_ci" value="PG"/>
+				</icons_combo_box>
+				<check_box label="Renouvellement auto toutes les semaines" name="auto_renew_edit"/>
+				<text name="price_for_listing_edit_label" value="Coût de l&apos;annonce :"/>
+				<spinner label="L$" name="price_for_listing_edit" tool_tip="Coût de l’annonce." value="50"/>
+			</panel>
+		</panel>
+	</scroll_container>
+	<layout_stack name="edit_btns_pnl">
+		<layout_panel name="teleport_btn_lp">
+			<button label="Téléportation" name="teleport_btn"/>
+		</layout_panel>
+		<layout_panel name="map_btn_lp">
+			<button label="Carte" name="show_on_map_btn"/>
+		</layout_panel>
+		<layout_panel name="edit_btn_lp">
+			<button label="Modifier" name="edit_btn"/>
+		</layout_panel>
+		<layout_panel name="save_btn_lp">
+			<button label="[LABEL]" name="save_changes_btn"/>
+		</layout_panel>
+		<layout_panel name="cancel_btn_lp">
+			<button label="Annuler" name="cancel_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/fr/panel_profile_classifieds.xml
new file mode 100644
index 0000000000..adb3501422
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_profile_classifieds.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Petite annonce" name="panel_profile_classifieds">
+	<string name="no_classifieds" value="Pas de petites annonces"/>
+	<button label="Nouveau..." name="new_btn"/>
+	<button label="Supprimer..." name="delete_btn"/>
+	<text name="classifieds_panel_text">
+		En cours de chargement...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/fr/panel_profile_firstlife.xml
new file mode 100644
index 0000000000..0f65090209
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_profile_firstlife.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Profil" name="panel_profile_firstlife"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile_interests.xml b/indra/newview/skins/default/xui/fr/panel_profile_interests.xml
new file mode 100644
index 0000000000..e8212817d2
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_profile_interests.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Centres d&apos;intérêt" name="panel_profile_interests">
+	<text name="I Want To:">
+		Je veux :
+	</text>
+	<check_box label="Construire" name="chk0"/>
+	<check_box label="Explorer" name="chk1"/>
+	<check_box label="Rencontrer" name="chk2"/>
+	<check_box label="Être recruté" name="chk6"/>
+	<check_box label="Grouper" name="chk3"/>
+	<check_box label="Acheter" name="chk4"/>
+	<check_box label="Vendre" name="chk5"/>
+	<check_box label="Louer" name="chk7"/>
+	<line_editor name="want_to_edit">
+		(en cours de chargement...)
+	</line_editor>
+	<text name="Skills:">
+		Compétences :
+	</text>
+	<check_box label="Textures" name="schk0"/>
+	<check_box label="Architecture" name="schk1"/>
+	<check_box label="Modèle" name="schk3"/>
+	<check_box label="Planification des événements" name="schk2"/>
+	<check_box label="Langage de scripts" name="schk4"/>
+	<check_box label="Personnages personnalisés" name="schk5"/>
+	<line_editor name="skills_edit">
+		(en cours de chargement...)
+	</line_editor>
+	<text name="Languages:">
+		Langues :
+	</text>
+	<line_editor name="languages_edit">
+		(en cours de chargement...)
+	</line_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile_notes.xml b/indra/newview/skins/default/xui/fr/panel_profile_notes.xml
new file mode 100644
index 0000000000..03fb37d72b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_profile_notes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Notes &amp; respect de la vie privée" name="panel_notes">
+	<text name="status_message" value="Notes personnelles sur cet avatar:"/>
+	<text name="status_message2" value="Autoriser cet avatar à :"/>
+	<check_box label="Voir quand je suis en ligne" name="status_check"/>
+	<check_box label="Me trouver sur la carte du monde" name="map_check"/>
+	<check_box label="Modifier, supprimer ou prendre mes objets" name="objects_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile_pick.xml b/indra/newview/skins/default/xui/fr/panel_profile_pick.xml
new file mode 100644
index 0000000000..017fcff88a
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_profile_pick.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_pick_info">
+	<panel.string name="location_notice">
+		(mise à jour après enregistrement)
+	</panel.string>
+	<line_editor name="pick_location">
+		En cours de chargement...
+	</line_editor>
+	<button label="Téléportation" name="teleport_btn"/>
+	<button label="Voir sur la carte" name="show_on_map_btn"/>
+	<button label="Définir l&apos;emplacement" name="set_to_curr_location_btn" tool_tip="Définir sur l’emplacement actuel"/>
+	<button label="Enregistrer les favoris" name="save_changes_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile_picks.xml b/indra/newview/skins/default/xui/fr/panel_profile_picks.xml
new file mode 100644
index 0000000000..1644722813
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_profile_picks.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Favoris" name="panel_picks">
+	<string name="no_picks" value="Pas de favoris"/>
+	<text name="Tell everyone about your favorite places in Second Life.">
+		Faites connaître aux autres résidents vos endroits favoris dans Second Life.
+	</text>
+	<button label="Nouveau..." name="new_btn"/>
+	<button label="Supprimer..." name="delete_btn"/>
+	<text name="picks_panel_text">
+		En cours de chargement...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/fr/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..de9cbf6dce
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_profile_secondlife.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Profil" name="panel_profile">
+	<string name="status_online">
+		Actuellement connecté
+	</string>
+	<string name="status_offline">
+		Actuellement déconnecté
+	</string>
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO]
+	</string>
+	<string name="payment_update_link_url">
+		http://www.secondlife.com/account/billing.php?lang=en
+	</string>
+	<string name="partner_edit_link_url">
+		http://www.secondlife.com/account/partners.php?lang=en
+	</string>
+	<string name="my_account_link_url" value="http://secondlife.com/account"/>
+	<string name="no_partner_text" value="Aucun"/>
+	<string name="no_group_text" value="Aucun"/>
+	<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="Développeur"/>
+	<string name="FSSupp" value="Assistance"/>
+	<string name="FSQualityAssurance" value="Suivi des anomalies"/>
+	<string name="FSGW" value="Portail"/>
+	<text name="name_label" value="Nom :"/>
+	<button label="Nom :" name="set_name" tool_tip="Définir un nom d&apos;affichage"/>
+	<panel name="name_holder">
+		<text_editor name="complete_name" value="(en cours de chargement...)"/>
+	</panel>
+	<layout_stack name="imagepositioner">
+		<layout_panel name="label_stack">
+			<text name="status" value="Statut inconnu"/>
+			<text name="label" value="Date de naissance dans Second Life :"/>
+			<text name="label2" value="Compte :"/>
+			<text name="partner_label" value="Partenaire :"/>
+		</layout_panel>
+	</layout_stack>
+	<text name="Groups:" value="Groupes :"/>
+	<button label="+" label_selected="+" name="group_invite" tool_tip="Inviter dans le groupe"/>
+	<layout_stack name="aboutpositioner">
+		<layout_panel name="about_stack">
+			<text name="About:" value="À propos :"/>
+		</layout_panel>
+		<layout_panel name="give_stack">
+			<text name="Give item:" value="Donner des objets :"/>
+			<text name="Give inventory" tool_tip="Placer les objets de l&apos;inventaire ici pour les donner à cette personne">
+				Placer les objets de l&apos;inventaire ici.
+			</text>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack name="buttonstack">
+		<layout_panel name="left_buttonstack">
+			<button label="Situer sur la carte" label_selected="Situer sur la carte" name="show_on_map_btn" tool_tip="Localiser le Résident sur la carte"/>
+			<button label="Payer" label_selected="Payer" name="pay" tool_tip="Payer le résident"/>
+		</layout_panel>
+		<layout_panel name="middle_buttonstack">
+			<button label="Proposer de téléporter" label_selected="Proposer de téléporter" name="teleport" tool_tip="Proposer une téléportation au Résident"/>
+			<button label="Message instantané" label_selected="Message instantané" name="im" tool_tip="Ouvrir une session IM."/>
+		</layout_panel>
+		<layout_panel name="right_buttonstack">
+			<button label="Ajouter un ami" label_selected="Ajouter un ami" name="add_friend" tool_tip="Proposer à ce résident de devenir votre ami"/>
+			<button label="Bloquer" name="block" tool_tip="Bloquer ce Résident"/>
+			<button label="Débloquer" name="unblock" tool_tip="Débloquer ce Résident"/>
+		</layout_panel>
+	</layout_stack>
+	<check_box label="Afficher avec la recherche" name="show_in_search_checkbox"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile_web.xml b/indra/newview/skins/default/xui/fr/panel_profile_web.xml
new file mode 100644
index 0000000000..70e145ade9
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_profile_web.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Web" name="panel_profile_web">
+	<panel.string name="LoadTime" value="Heure de chargement : [TIME] secondes"/>
+	<line_editor name="url_edit">
+		(en cours de chargement..)
+	</line_editor>
+	<flyout_button label="Charger" name="load" tool_tip="Charger ce profil avec le navigateur Web incorporé">
+		<flyout_button.item label="Ouvrir dans mon navigateur Web" name="open_item"/>
+		<flyout_button.item label="Ouvrir dans un navigateur externe" name="home_item"/>
+	</flyout_button>
+	<button name="web_profile_popout_btn" tool_tip="Profil de fenêtres web"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index dbd5cc3bf4..dec7117cb6 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -358,6 +358,24 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="TestingDisconnect">
 		Test de déconnexion du client
 	</string>
+	<string name="SocialFacebookConnecting">
+		Connexion à Facebook…
+	</string>
+	<string name="SocialFacebookPosting">
+		Publication…
+	</string>
+	<string name="SocialFacebookDisconnecting">
+		Déconnexion de Facebook…
+	</string>
+	<string name="SocialFacebookErrorConnecting">
+		Un problème est survenu lors de la connexion à Facebook.
+	</string>
+	<string name="SocialFacebookErrorPosting">
+		Un problème est survenu lors de la publication sur Facebook.
+	</string>
+	<string name="SocialFacebookErrorDisconnecting">
+		Un problème est survenu lors de la déconnexion à Facebook.
+	</string>
 	<string name="SocialFlickrConnecting">
 		Connexion à Flickr...
 	</string>
@@ -2511,9 +2529,21 @@ Si vous continuez de recevoir ce message, contactez l’assistance Second Life 
 	<string name="NoPicksClassifiedsText">
 		Vous n&apos;avez pas créé de favoris ni de petites annonces Cliquez sur le bouton Plus pour créer un favori ou une petite annonce.
 	</string>
+	<string name="NoPicksText">
+		Vous n&apos;avez pas créé de favoris Cliquer sur le bouton Nouveau pour créer un favori
+	</string>
+	<string name="NoClassifiedsText">
+		Vous n&apos;avez pas créé de petites annonces Cliquer sur le bouton Nouveau pour créer une petite annonce.
+	</string>
 	<string name="NoAvatarPicksClassifiedsText">
 		L&apos;utilisateur n&apos;a ni favoris ni petites annonces.
 	</string>
+	<string name="NoAvatarPicksText">
+		L&apos;utilisateur n&apos;a pas de favoris
+	</string>
+	<string name="NoAvatarClassifiedsText">
+		L&apos;utilisateur n&apos;a pas de petites annonces
+	</string>
 	<string name="PicksClassifiedsLoadingText">
 		Chargement...
 	</string>
@@ -4491,6 +4521,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="share_alert">
 		Faire glisser les objets de l&apos;inventaire ici
 	</string>
+	<string name="facebook_post_success">
+		Vous avez publié sur Facebook.
+	</string>
 	<string name="flickr_post_success">
 		Vous avez publié sur Flickr.
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index 67c46b6b62..c1488512bd 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -359,7 +359,7 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Clicca per scegliere una immagine"/>
 			<text name="allow_label5">
-				Gli avatar su altri lotti possono vedere gli avatar su questo lotto e chattare con loro
+				Gli avatar di altri lotti possono vedere gli avatar che si trovano in questo lotto e chattare con loro
 			</text>
 			<check_box label="Vedi avatar" name="SeeAvatarsCheck" tool_tip="Consente ad avatar in altri lotti di vedere e chattare con avatar in questo lotto e viceversa."/>
 			<text name="landing_point">
diff --git a/indra/newview/skins/default/xui/it/floater_preview_texture.xml b/indra/newview/skins/default/xui/it/floater_preview_texture.xml
index 5b4054514e..02f15b6b7b 100644
--- a/indra/newview/skins/default/xui/it/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_texture.xml
@@ -6,42 +6,23 @@
 	<floater.string name="Copy">
 		Copia nell&apos;Inventario
 	</floater.string>
-	<text name="desc txt">
-		Descrizione:
-	</text>
-	<text name="dimensions">
-		[WIDTH] px x [HEIGHT] px
-	</text>
-	<text name="aspect_ratio">
-		Antreprima rapporto di visualizzazione
-	</text>
-	<combo_box name="combo_aspect_ratio" tool_tip="Anteprima con rapporto di visualizzazione fisso">
-		<combo_item name="Unconstrained">
-			Libero
-		</combo_item>
-		<combo_item name="1:1" tool_tip="Logo del gruppo o profilo nel mondo reale">
-			1:1
-		</combo_item>
-		<combo_item name="4:3" tool_tip="Profilo [SECOND_LIFE]">
-			4:3
-		</combo_item>
-		<combo_item name="10:7" tool_tip="Annunci e inserzioni, punti di riferimento">
-			10:7
-		</combo_item>
-		<combo_item name="3:2" tool_tip="Informazioni sul terreno">
-			3:2
-		</combo_item>
-		<combo_item name="16:10">
-			16:10
-		</combo_item>
-		<combo_item name="16:9" tool_tip="Preferiti del Profilo">
-			16:9
-		</combo_item>
-		<combo_item name="2:1">
-			2:1
-		</combo_item>
-	</combo_box>
-	<button label="OK" name="Keep"/>
-	<button label="Elimina" name="Discard"/>
-	<button label="Salva con nome" name="save_tex_btn"/>
+	<layout_stack name="preview_stack">
+		<layout_panel name="texture_panel">
+			<text name="desc txt">
+				Descrizione:
+			</text>
+			<text name="dimensions">
+				[WIDTH]px x [HEIGHT]px
+			</text>
+			<text name="aspect_ratio">
+				Antreprima rapporto di visualizzazione
+			</text>
+			<combo_box name="combo_aspect_ratio" tool_tip="Anteprima con rapporto di visualizzazione fisso"/>
+		</layout_panel>
+		<layout_panel name="buttons_panel">
+			<button label="OK" name="Keep"/>
+			<button label="Elimina" name="Discard"/>
+			<button label="Salva con nome" name="save_tex_btn"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_profile.xml b/indra/newview/skins/default/xui/it/floater_profile.xml
new file mode 100644
index 0000000000..7e23f9bbbb
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_profile.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarinfo" title="Profilo">
+	<panel name="panel_profile_view">
+		<tab_container name="panel_profile_tabs">
+			<panel label="Second Life" name="panel_profile_secondlife"/>
+			<panel label="Web" name="panel_profile_web"/>
+			<panel label="Interessi" name="panel_profile_interests"/>
+			<panel label="Preferiti" name="panel_profile_picks"/>
+			<panel label="Annuncio" name="panel_profile_classifieds"/>
+			<panel label="Vita reale" name="panel_profile_firstlife"/>
+			<panel label="Note" name="panel_profile_notes"/>
+		</tab_container>
+		<button label="OK" name="ok_btn" tool_tip="Salva modifiche al profilo e chiudi"/>
+		<button label="Annulla" label_selected="Annulla" name="cancel_btn"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_snapshot.xml b/indra/newview/skins/default/xui/it/floater_snapshot.xml
index d21c206f6f..c9f71a167e 100644
--- a/indra/newview/skins/default/xui/it/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/it/floater_snapshot.xml
@@ -6,6 +6,9 @@
 	<string name="postcard_progress_str">
 		Invio e-mail in corso
 	</string>
+	<string name="facebook_progress_str">
+		Pubblicazione su Facebook in corso
+	</string>
 	<string name="profile_progress_str">
 		Caricamento post
 	</string>
@@ -15,6 +18,9 @@
 	<string name="local_progress_str">
 		Salvataggio sul computer in corso
 	</string>
+	<string name="facebook_succeeded_str">
+		Immagine caricata
+	</string>
 	<string name="profile_succeeded_str">
 		Immagine caricata
 	</string>
@@ -27,6 +33,9 @@
 	<string name="local_succeeded_str">
 		Salvato sul computer.
 	</string>
+	<string name="facebook_failed_str">
+		Caricamento immagine sul diario di Facebook non riuscito.
+	</string>
 	<string name="profile_failed_str">
 		Caricamento immagine sul feed del profilo non riuscito.
 	</string>
diff --git a/indra/newview/skins/default/xui/it/menu_name_field.xml b/indra/newview/skins/default/xui/it/menu_name_field.xml
new file mode 100644
index 0000000000..9ac863323c
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_name_field.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="CopyMenu">
+	<menu_item_call label="Copia Nome Visualizzato" name="copy_display"/>
+	<menu_item_call label="Copia Nome Agente" name="copy_name"/>
+	<menu_item_call label="Copia ID Agente" name="copy_id"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 07a3eb5095..9c0d5ddd67 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -2663,6 +2663,9 @@ Prova a selezionare una parte di terreno più piccola.
 	<notification name="SystemMessage">
 		[MESSAGE]
 	</notification>
+	<notification name="FacebookConnect">
+		[MESSAGE]
+	</notification>
 	<notification name="FlickrConnect">
 		[MESSAGE]
 	</notification>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_classified.xml b/indra/newview/skins/default/xui/it/panel_edit_classified.xml
index ad827696ff..57e422a25b 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_classified.xml
@@ -46,7 +46,7 @@
 			<layout_panel name="save_changes_btn_lp">
 				<button label="[LABEL]" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="show_on_map_btn_lp">
+			<layout_panel name="cancel_btn_lp">
 				<button label="Annulla" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/it/panel_facebook_friends.xml b/indra/newview/skins/default/xui/it/panel_facebook_friends.xml
index c1c0489f88..28769a010f 100644
--- a/indra/newview/skins/default/xui/it/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/it/panel_facebook_friends.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_facebook_friends">
-	<string name="facebook_friends_empty" value="Attualmente non hai amici su Facebook che sono anche residenti in Second Life. Invita i tuoi amici di Facebook a partecipare a Second Life!"/>
-	<string name="facebook_friends_no_connected" value="Attualmente non sei in collegamento con Facebook. Accedi alla scheda Stato per collegarti e attivare questa funzionalità."/>
+	<string name="facebook_friends_empty" value="Attualmente non hai amici su Facebook che sono anche residenti Second Life. Invita ora i tuoi amici di Facebook a unirsi a Second Life!"/>
+	<string name="facebook_friends_no_connected" value="Non sei connesso a Facebook. Accedi alla scheda Stato per collegarti e attivare questa funzionalità."/>
 	<accordion name="friends_accordion">
 		<accordion_tab name="tab_second_life_friends" title="Amici SL"/>
 		<accordion_tab name="tab_suggested_friends" title="Aggiungi queste persone come amici SL"/>
 	</accordion>
 	<text name="facebook_friends_status">
-		Non in collegamento con Facebook.
+		Non connesso a Facebook.
 	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_facebook_photo.xml b/indra/newview/skins/default/xui/it/panel_facebook_photo.xml
index 044b8b6164..8d66f35c3c 100644
--- a/indra/newview/skins/default/xui/it/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/it/panel_facebook_photo.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_facebook_photo">
-	<combo_box name="resolution_combobox" tool_tip="Risoluzione immagini">
+	<combo_box name="resolution_combobox" tool_tip="Risoluzione immagine">
 		<combo_box.item label="Finestra attuale" name="CurrentWindow"/>
 		<combo_box.item label="640x480" name="640x480"/>
 		<combo_box.item label="800x600" name="800x600"/>
 		<combo_box.item label="1024x768" name="1024x768"/>
 		<combo_box.item label="1200x630" name="1200x630"/>
 	</combo_box>
-	<combo_box name="filters_combobox" tool_tip="Filtri immagini">
+	<combo_box name="filters_combobox" tool_tip="Filtri immagine">
 		<combo_box.item label="Nessun filtro" name="NoFilter"/>
 	</combo_box>
 	<button label="Aggiorna" name="new_snapshot_btn" tool_tip="Fai clic per aggiornare"/>
diff --git a/indra/newview/skins/default/xui/it/panel_facebook_status.xml b/indra/newview/skins/default/xui/it/panel_facebook_status.xml
index 9b5171043a..7fb1cec78e 100644
--- a/indra/newview/skins/default/xui/it/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/it/panel_facebook_status.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_facebook_status">
-	<string name="facebook_connected" value="Sei in collegamento con Facebook come:"/>
-	<string name="facebook_disconnected" value="Non in collegamento con Facebook"/>
+	<string name="facebook_connected" value="Sei connesso a Facebook come:"/>
+	<string name="facebook_disconnected" value="Non connesso a Facebook"/>
 	<text name="account_caption_label">
-		Non in collegamento con Facebook.
+		Non connesso a Facebook.
 	</text>
 	<panel name="panel_buttons">
-		<button label="Collegamento..." name="connect_btn"/>
-		<button label="Interrompi collegamento" name="disconnect_btn"/>
+		<button label="Connessione in corso..." name="connect_btn"/>
+		<button label="Disconnetti" name="disconnect_btn"/>
 		<text name="account_learn_more_label">
 			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Come pubblicare su Facebook]
 		</text>
diff --git a/indra/newview/skins/default/xui/it/panel_group_general.xml b/indra/newview/skins/default/xui/it/panel_group_general.xml
index 49baa73811..168524d1ad 100644
--- a/indra/newview/skins/default/xui/it/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_general.xml
@@ -46,7 +46,7 @@ Muovi il tuo mouse sopra le opzioni per maggiore aiuto.
 		<check_box label="Chiunque può aderire" name="open_enrollement" tool_tip="Imposta se questo gruppo permette ai nuovi membri di aderire senza essere invitati."/>
 		<check_box label="Quota di adesione" name="check_enrollment_fee" tool_tip="Imposta se richiedere una tassa d&apos;iscrizione per aderire al gruppo"/>
 		<spinner label="L$" left_delta="136" name="spin_enrollment_fee" tool_tip="I nuovi soci devono pagare questa tassa d&apos;iscrizione quando è selezionata." width="60"/>
-		<combo_box name="group_mature_check" tool_tip="Imposta se le informazioni sul tuo gruppo sono da considerarsi di tipo Moderato.">
+		<combo_box name="group_mature_check" tool_tip="Determina se il tuo gruppo contiene informazioni contrassegnate come Moderate opppure no">
 			<combo_item name="select_mature">
 				- Seleziona categoria di accesso -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/it/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/it/panel_group_list_item_short.xml
new file mode 100644
index 0000000000..72e644008c
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_group_list_item_short.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="group_list_item">
+	<text name="group_name" value="Sconosciuto"/>
+	<button name="info_btn" tool_tip="Maggiori informazioni"/>
+	<button name="profile_btn" tool_tip="Vedi profilo"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index 38a03fb4d2..3174c624b4 100644
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -40,6 +40,7 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Tutto"/>
+				<accordion_tab name="tab_suggested_friends" title="Persone che potresti voler aggiungere agli amici"/>
 			</accordion>
 		</panel>
 		<panel label="GRUPPI" name="groups_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_profile_classified.xml b/indra/newview/skins/default/xui/it/panel_profile_classified.xml
new file mode 100644
index 0000000000..3c88fbe92f
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_profile_classified.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_profile_classified">
+	<panel.string name="type_mature">
+		Moderato
+	</panel.string>
+	<panel.string name="type_pg">
+		Contenuto Generale
+	</panel.string>
+	<panel.string name="l$_price">
+		L$[PRICE]
+	</panel.string>
+	<panel.string name="click_through_text_fmt">
+		[TELEPORT] teletrasporto, [MAP] mappa, [PROFILE] profilo
+	</panel.string>
+	<panel.string name="date_fmt">
+		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+	</panel.string>
+	<panel.string name="auto_renew_on">
+		Abilitato
+	</panel.string>
+	<panel.string name="auto_renew_off">
+		Disabilitato
+	</panel.string>
+	<panel.string name="location_notice">
+		(si aggiornerà dopo il salvataggio)
+	</panel.string>
+	<string name="publish_label">
+		Pubblica
+	</string>
+	<string name="save_label">
+		Salva
+	</string>
+	<scroll_container name="profile_scroll">
+		<panel name="info_scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="Fai clic per selezionare un&apos;immagine"/>
+			<layout_stack name="info_panel">
+				<layout_panel name="main_info_panel">
+					<text_editor name="classified_name">
+						[name]
+					</text_editor>
+					<text name="classified_location_label" value="Posizione:"/>
+					<text_editor name="classified_location" value="[loading...]"/>
+					<text name="content_type_label" value="Tipo di contenuto:"/>
+					<text_editor name="content_type" value="[content type]"/>
+					<text name="category_label" value="Categoria:"/>
+					<text_editor name="category" value="[category]"/>
+					<text name="creation_date_label" value="Data di creazione:"/>
+					<text_editor name="creation_date" tool_tip="Data di creazione" value="[date]"/>
+					<text name="price_for_listing_label" value="Prezzo per inserzione:"/>
+					<text_editor name="price_for_listing" tool_tip="Prezzo per inserzione.">
+						[PRICE]
+					</text_editor>
+				</layout_panel>
+				<layout_panel name="clickthrough_layout_panel">
+					<text name="click_through_label" value="Clic:"/>
+					<text_editor name="click_through_text" tool_tip="Numero di clic" value="[clicks]"/>
+				</layout_panel>
+				<layout_panel name="auto_renew_layout_panel">
+					<text name="auto_renew_label" value="Rinnovo automatico:"/>
+					<text name="auto_renew" value="Abilitato"/>
+				</layout_panel>
+				<layout_panel name="descr_layout_panel">
+					<text name="classified_desc_label" value="Descrizione:"/>
+					<text_editor name="classified_desc" value="[description]"/>
+				</layout_panel>
+			</layout_stack>
+			<panel name="edit_panel">
+				<text name="Name:">
+					Titolo:
+				</text>
+				<text name="description_label">
+					Descrizione:
+				</text>
+				<text name="location_label">
+					Posizione:
+				</text>
+				<text name="classified_location_edit">
+					caricamento in corso...
+				</text>
+				<button label="Imposta come Luogo Attuale" name="set_to_curr_location_btn"/>
+				<text name="category_label" value="Categoria:"/>
+				<text name="content_type_label" value="Tipo di contenuto:"/>
+				<icons_combo_box label="Contenuto Generale" name="content_type_edit">
+					<icons_combo_box.item label="Contenuto Moderato" name="mature_ci" value="Per adulti"/>
+					<icons_combo_box.item label="Contenuto Generale" name="pg_ci" value="PG"/>
+				</icons_combo_box>
+				<check_box label="Rinnovo automatico ogni settimana" name="auto_renew_edit"/>
+				<text name="price_for_listing_edit_label" value="Prezzo per inserzione:"/>
+				<spinner label="L$" name="price_for_listing_edit" tool_tip="Prezzo per inserzione." value="50"/>
+			</panel>
+		</panel>
+	</scroll_container>
+	<layout_stack name="edit_btns_pnl">
+		<layout_panel name="teleport_btn_lp">
+			<button label="Teletrasporto" name="teleport_btn"/>
+		</layout_panel>
+		<layout_panel name="map_btn_lp">
+			<button label="Mappa" name="show_on_map_btn"/>
+		</layout_panel>
+		<layout_panel name="edit_btn_lp">
+			<button label="Modifica" name="edit_btn"/>
+		</layout_panel>
+		<layout_panel name="save_btn_lp">
+			<button label="[LABEL]" name="save_changes_btn"/>
+		</layout_panel>
+		<layout_panel name="cancel_btn_lp">
+			<button label="Annulla" name="cancel_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/it/panel_profile_classifieds.xml
new file mode 100644
index 0000000000..6fc0fd0729
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_profile_classifieds.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Annuncio" name="panel_profile_classifieds">
+	<string name="no_classifieds" value="Nessuno annuncio"/>
+	<button label="Nuovo..." name="new_btn"/>
+	<button label="Elimina..." name="delete_btn"/>
+	<text name="classifieds_panel_text">
+		Caricamento in corso...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/it/panel_profile_firstlife.xml
new file mode 100644
index 0000000000..bf8ccef273
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_profile_firstlife.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Profilo" name="panel_profile_firstlife"/>
diff --git a/indra/newview/skins/default/xui/it/panel_profile_interests.xml b/indra/newview/skins/default/xui/it/panel_profile_interests.xml
new file mode 100644
index 0000000000..9fe7331e5c
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_profile_interests.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Interessi" name="panel_profile_interests">
+	<text name="I Want To:">
+		Desidero:
+	</text>
+	<check_box label="Costruire" name="chk0"/>
+	<check_box label="Esplorare" name="chk1"/>
+	<check_box label="Incontrare" name="chk2"/>
+	<check_box label="Essere assunto" name="chk6"/>
+	<check_box label="Gruppo" name="chk3"/>
+	<check_box label="Acquistare" name="chk4"/>
+	<check_box label="Vendere" name="chk5"/>
+	<check_box label="Assumere" name="chk7"/>
+	<line_editor name="want_to_edit">
+		(caricamento in corso...)
+	</line_editor>
+	<text name="Skills:">
+		Abilità:
+	</text>
+	<check_box label="Texture" name="schk0"/>
+	<check_box label="Architettura" name="schk1"/>
+	<check_box label="Realizzazione modelli 3D" name="schk3"/>
+	<check_box label="Organizzazione eventi" name="schk2"/>
+	<check_box label="Scripting" name="schk4"/>
+	<check_box label="Personaggi personalizzati" name="schk5"/>
+	<line_editor name="skills_edit">
+		(caricamento in corso...)
+	</line_editor>
+	<text name="Languages:">
+		Lingue:
+	</text>
+	<line_editor name="languages_edit">
+		(caricamento in corso...)
+	</line_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_profile_notes.xml b/indra/newview/skins/default/xui/it/panel_profile_notes.xml
new file mode 100644
index 0000000000..abd5a347c3
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_profile_notes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Note e Privacy" name="panel_notes">
+	<text name="status_message" value="Annotazioni private su questo avatar:"/>
+	<text name="status_message2" value="Consenti a questo avatar di:"/>
+	<check_box label="Vedere quando sono in linea" name="status_check"/>
+	<check_box label="Trovarmi sulla mappa del mondo" name="map_check"/>
+	<check_box label="Modificare, eliminare o prendere i miei oggetti" name="objects_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_profile_pick.xml b/indra/newview/skins/default/xui/it/panel_profile_pick.xml
new file mode 100644
index 0000000000..5d2b145565
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_profile_pick.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_pick_info">
+	<panel.string name="location_notice">
+		(si aggiornerà dopo il salvataggio)
+	</panel.string>
+	<line_editor name="pick_location">
+		Caricamento in corso...
+	</line_editor>
+	<button label="Teletrasporto" name="teleport_btn"/>
+	<button label="Mostra sulla mappa" name="show_on_map_btn"/>
+	<button label="Imposta Luogo" name="set_to_curr_location_btn" tool_tip="Imposta come Luogo Attuale"/>
+	<button label="Salva Luogo preferito" name="save_changes_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_profile_picks.xml b/indra/newview/skins/default/xui/it/panel_profile_picks.xml
new file mode 100644
index 0000000000..37cffcf622
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_profile_picks.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Preferiti" name="panel_picks">
+	<string name="no_picks" value="Nessun preferito"/>
+	<text name="Tell everyone about your favorite places in Second Life.">
+		Comunica a tutti quali sono i tuoi posti preferiti in Second Life.
+	</text>
+	<button label="Nuovo..." name="new_btn"/>
+	<button label="Elimina..." name="delete_btn"/>
+	<text name="picks_panel_text">
+		Caricamento in corso...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/it/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..47af1960a5
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_profile_secondlife.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Profilo" name="panel_profile">
+	<string name="status_online">
+		Ora in linea
+	</string>
+	<string name="status_offline">
+		Ora non in linea
+	</string>
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO]
+	</string>
+	<string name="payment_update_link_url">
+		http://www.secondlife.com/account/billing.php?lang=en
+	</string>
+	<string name="partner_edit_link_url">
+		http://www.secondlife.com/account/partners.php?lang=en
+	</string>
+	<string name="my_account_link_url" value="http://secondlife.com/account"/>
+	<string name="no_partner_text" value="Nessuno"/>
+	<string name="no_group_text" value="Nessuno"/>
+	<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="Sviluppatore"/>
+	<string name="FSSupp" value="Assistenza"/>
+	<string name="FSQualityAssurance" value="Bug Hunter"/>
+	<string name="FSGW" value="Gateway"/>
+	<text name="name_label" value="Nome:"/>
+	<button label="Nome:" name="set_name" tool_tip="Imposta nome visualizzato"/>
+	<panel name="name_holder">
+		<text_editor name="complete_name" value="(caricamento in corso...)"/>
+	</panel>
+	<layout_stack name="imagepositioner">
+		<layout_panel name="label_stack">
+			<text name="status" value="Stato Sconosciuto"/>
+			<text name="label" value="Compleanno Second Life:"/>
+			<text name="label2" value="Account:"/>
+			<text name="partner_label" value="Partner:"/>
+		</layout_panel>
+	</layout_stack>
+	<text name="Groups:" value="Gruppi:"/>
+	<button label="+" label_selected="+" name="group_invite" tool_tip="Invita al gruppo:"/>
+	<layout_stack name="aboutpositioner">
+		<layout_panel name="about_stack">
+			<text name="About:" value="Informazioni generali:"/>
+		</layout_panel>
+		<layout_panel name="give_stack">
+			<text name="Give item:" value="Consegna oggetto:"/>
+			<text name="Give inventory" tool_tip="Rilascia gli oggetti dell’inventario per consegnarli a questa persona.">
+				Rilascia l’oggetto dell’inventario qui.
+			</text>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack name="buttonstack">
+		<layout_panel name="left_buttonstack">
+			<button label="Trova sulla mappa" label_selected="Trova sulla mappa" name="show_on_map_btn" tool_tip="Localizza il Residente sulla mappa"/>
+			<button label="Paga" label_selected="Paga" name="pay" tool_tip="Paga del denaro al Residente"/>
+		</layout_panel>
+		<layout_panel name="middle_buttonstack">
+			<button label="Offri Teletrasporto" label_selected="Offri Teletrasporto" name="teleport" tool_tip="Offri il teletrasporto al Residente"/>
+			<button label="Messaggio istantaneo" label_selected="Messaggio istantaneo" name="im" tool_tip="Apri sessione di messaggistica istantanea"/>
+		</layout_panel>
+		<layout_panel name="right_buttonstack">
+			<button label="Aggiungi come amico" label_selected="Aggiungi come amico" name="add_friend" tool_tip="Offri amicizia al Residente"/>
+			<button label="Blocca" name="block" tool_tip="Blocca questo Residente"/>
+			<button label="Sblocca" name="unblock" tool_tip="Sblocca questo Residente"/>
+		</layout_panel>
+	</layout_stack>
+	<check_box label="Mostra nella ricerca" name="show_in_search_checkbox"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_profile_web.xml b/indra/newview/skins/default/xui/it/panel_profile_web.xml
new file mode 100644
index 0000000000..0c3a8ddcf5
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_profile_web.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Web" name="panel_profile_web">
+	<panel.string name="LoadTime" value="Tempo di caricamento: [TIME] secondi"/>
+	<line_editor name="url_edit">
+		(caricamento in corso..)
+	</line_editor>
+	<flyout_button label="Carica" name="load" tool_tip="Carica la pagina profilo con il browser Web integrato.">
+		<flyout_button.item label="Apri browser interno" name="open_item"/>
+		<flyout_button.item label="Apri browser esterno" name="home_item"/>
+	</flyout_button>
+	<button name="web_profile_popout_btn" tool_tip="Profilo web a comparsa"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 9492d062c3..5e5d8b48ca 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -354,6 +354,24 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="TestingDisconnect">
 		Verifica scollegamento viewer
 	</string>
+	<string name="SocialFacebookConnecting">
+		Connessione a Facebook in corso...
+	</string>
+	<string name="SocialFacebookPosting">
+		Caricamento post...
+	</string>
+	<string name="SocialFacebookDisconnecting">
+		Disconnessione da Facebook in corso...
+	</string>
+	<string name="SocialFacebookErrorConnecting">
+		Problemi con la connessione a Facebook
+	</string>
+	<string name="SocialFacebookErrorPosting">
+		Problemi con la connessione a Facebook
+	</string>
+	<string name="SocialFacebookErrorDisconnecting">
+		Problemi con la disconnessione da Facebook
+	</string>
 	<string name="SocialFlickrConnecting">
 		Collegamento a Flickr...
 	</string>
@@ -2489,9 +2507,21 @@ Se continui a ricevere questo messaggio, contatta l&apos;assistenza Second Life
 	<string name="NoPicksClassifiedsText">
 		Non hai creato luoghi preferiti né inserzioni. Clicca il pulsante + qui sotto per creare un luogo preferito o un&apos;inserzione.
 	</string>
+	<string name="NoPicksText">
+		Non hai creato Luoghi preferiti. Fai clic sul pulsante Nuovo per creare un Luogo preferito.
+	</string>
+	<string name="NoClassifiedsText">
+		Non hai creato Annunci. Fai clic sul pulsante Nuovo per creare un Annuncio.
+	</string>
 	<string name="NoAvatarPicksClassifiedsText">
 		L&apos;utente non ha luoghi preferiti né inserzioni
 	</string>
+	<string name="NoAvatarPicksText">
+		L&apos;utente non ha luoghi preferiti
+	</string>
+	<string name="NoAvatarClassifiedsText">
+		L&apos;utente non ha annunci
+	</string>
 	<string name="PicksClassifiedsLoadingText">
 		Caricamento in corso...
 	</string>
@@ -4406,6 +4436,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="inventory_folder_offered-im">
 		Offerta cartella di inventario &quot;[ITEM_NAME]&quot;
 	</string>
+	<string name="facebook_post_success">
+		Hai pubblicato su Facebook.
+	</string>
 	<string name="flickr_post_success">
 		Hai pubblicato su Flickr.
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index df94daad8e..f839482cac 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -356,7 +356,7 @@
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="写真をクリックして選択"/>
 			<text name="allow_label5">
-				他の区画にいるアバターがこの区画にいるアバターに会ってチャットできる
+				他の区画にいるアバターがこの区画にいるアバターに会ってチャットできます
 			</text>
 			<check_box label="アバターを表示" name="SeeAvatarsCheck" tool_tip="他の区画のアバターが、この区画にいるアバターに会ってチャットすることを許可し、あなたもそれらアバターに会ってチャットできるようにします。"/>
 			<text name="landing_point">
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
index 4617fd1d92..66ef13948a 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
@@ -6,42 +6,23 @@
 	<floater.string name="Copy">
 		インベントリにコピー
 	</floater.string>
-	<text name="desc txt">
-		説明：
-	</text>
-	<text name="dimensions">
-		[WIDTH]px x [HEIGHT]px
-	</text>
-	<text name="aspect_ratio">
-		縦横比のプレビュー
-	</text>
-	<combo_box name="combo_aspect_ratio" tool_tip="固定した縦横比のプレビュー">
-		<combo_item name="Unconstrained">
-			非拘束
-		</combo_item>
-		<combo_item name="1:1" tool_tip="グループ記章か現実世界のプロフィール">
-			1:1
-		</combo_item>
-		<combo_item name="4:3" tool_tip="[SECOND_LIFE] プロフィール">
-			4:3
-		</combo_item>
-		<combo_item name="10:7" tool_tip="クラシファイド広告、検索一覧、ランドマーク">
-			10:7
-		</combo_item>
-		<combo_item name="3:2" tool_tip="土地情報">
-			3:2
-		</combo_item>
-		<combo_item name="16:10">
-			16:10
-		</combo_item>
-		<combo_item name="16:9" tool_tip="プロフィールのピック">
-			16:9
-		</combo_item>
-		<combo_item name="2:1">
-			2:1
-		</combo_item>
-	</combo_box>
-	<button label="OK" name="Keep"/>
-	<button label="処分する" name="Discard"/>
-	<button label="別名で保存" name="save_tex_btn"/>
+	<layout_stack name="preview_stack">
+		<layout_panel name="texture_panel">
+			<text name="desc txt">
+				説明：
+			</text>
+			<text name="dimensions">
+				[WIDTH]px x [HEIGHT]px
+			</text>
+			<text name="aspect_ratio">
+				縦横比のプレビュー
+			</text>
+			<combo_box name="combo_aspect_ratio" tool_tip="固定した縦横比のプレビュー"/>
+		</layout_panel>
+		<layout_panel name="buttons_panel">
+			<button label="OK" name="Keep"/>
+			<button label="処分する" name="Discard"/>
+			<button label="別名で保存" name="save_tex_btn"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_profile.xml b/indra/newview/skins/default/xui/ja/floater_profile.xml
new file mode 100644
index 0000000000..e06cd6e8f6
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_profile.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarinfo" title="プロフィール">
+	<panel name="panel_profile_view">
+		<tab_container name="panel_profile_tabs">
+			<panel label="Second Life" name="panel_profile_secondlife"/>
+			<panel label="Web" name="panel_profile_web"/>
+			<panel label="趣味" name="panel_profile_interests"/>
+			<panel label="ピック" name="panel_profile_picks"/>
+			<panel label="クラシファイド広告" name="panel_profile_classifieds"/>
+			<panel label="リアルライフ（現実世界）" name="panel_profile_firstlife"/>
+			<panel label="メモ" name="panel_profile_notes"/>
+		</tab_container>
+		<button label="OK" name="ok_btn" tool_tip="プロフィールの変更を保存して閉じる"/>
+		<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index f04193d034..64f292c75c 100644
--- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
@@ -6,6 +6,9 @@
 	<string name="postcard_progress_str">
 		メールの送信
 	</string>
+	<string name="facebook_progress_str">
+		Facebook へ投稿中
+	</string>
 	<string name="profile_progress_str">
 		投稿
 	</string>
@@ -15,6 +18,9 @@
 	<string name="local_progress_str">
 		コンピュータに保存
 	</string>
+	<string name="facebook_succeeded_str">
+		画像がアップロードされました
+	</string>
 	<string name="profile_succeeded_str">
 		画像がアップロードされました
 	</string>
@@ -27,6 +33,9 @@
 	<string name="local_succeeded_str">
 		コンピュータに保存されました
 	</string>
+	<string name="facebook_failed_str">
+		Facebook のタイムラインに画像をアップロードできませんでした。
+	</string>
 	<string name="profile_failed_str">
 		プロフィールフィードに画像をアップロードできませんでした。
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/menu_name_field.xml b/indra/newview/skins/default/xui/ja/menu_name_field.xml
new file mode 100644
index 0000000000..8c37d95073
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_name_field.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="CopyMenu">
+	<menu_item_call label="表示名をコピー" name="copy_display"/>
+	<menu_item_call label="エージェント名をコピー" name="copy_name"/>
+	<menu_item_call label="エージェント ID をコピー" name="copy_id"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 16aeb4dcd7..74208bb30b 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -2705,6 +2705,9 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 	<notification name="SystemMessage">
 		[MESSAGE]
 	</notification>
+	<notification name="FacebookConnect">
+		[MESSAGE]
+	</notification>
 	<notification name="FlickrConnect">
 		[MESSAGE]
 	</notification>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
index b556b68e02..619e9de65a 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
@@ -46,8 +46,8 @@
 			<layout_panel name="save_changes_btn_lp">
 				<button label="[LABEL]" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="show_on_map_btn_lp">
-				<button label="取り消し" name="cancel_btn"/>
+			<layout_panel name="cancel_btn_lp">
+				<button label="キャンセル" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
 	</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_facebook_photo.xml b/indra/newview/skins/default/xui/ja/panel_facebook_photo.xml
index c48f13456b..ee57d178e8 100644
--- a/indra/newview/skins/default/xui/ja/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/ja/panel_facebook_photo.xml
@@ -16,5 +16,5 @@
 		コメント (オプション):
 	</text>
 	<button label="投稿" name="post_photo_btn"/>
-	<button label="取り消し" name="cancel_photo_btn"/>
+	<button label="キャンセル" name="cancel_photo_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_facebook_place.xml b/indra/newview/skins/default/xui/ja/panel_facebook_place.xml
index 61138f90c1..e97422a9df 100644
--- a/indra/newview/skins/default/xui/ja/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/ja/panel_facebook_place.xml
@@ -5,5 +5,5 @@
 	</text>
 	<check_box initial_value="false" label="場所の俯瞰図を含める" name="add_place_view_cb"/>
 	<button label="投稿" name="post_place_btn"/>
-	<button label="取り消し" name="cancel_place_btn"/>
+	<button label="キャンセル" name="cancel_place_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_facebook_status.xml b/indra/newview/skins/default/xui/ja/panel_facebook_status.xml
index 9d962c9d62..1f48c9c8c7 100644
--- a/indra/newview/skins/default/xui/ja/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/ja/panel_facebook_status.xml
@@ -9,12 +9,12 @@
 		<button label="接続..." name="connect_btn"/>
 		<button label="切断" name="disconnect_btn"/>
 		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Facebook への投稿について]]
+			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Facebook への投稿について]
 		</text>
 	</panel>
 	<text name="status_caption_label">
 		今、何を考えている?
 	</text>
 	<button label="投稿" name="post_status_btn"/>
-	<button label="取り消し" name="cancel_status_btn"/>
+	<button label="キャンセル" name="cancel_status_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml
new file mode 100644
index 0000000000..77d3d8f391
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="group_list_item">
+	<text name="group_name" value="不明"/>
+	<button name="info_btn" tool_tip="詳細"/>
+	<button name="profile_btn" tool_tip="プロフィールの表示"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index 5fc4b57a08..656a8e2ade 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -40,6 +40,7 @@
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="オンライン"/>
 				<accordion_tab name="tab_all" title="全員"/>
+				<accordion_tab name="tab_suggested_friends" title="友だちになりたくない人"/>
 			</accordion>
 		</panel>
 		<panel label="グループ" name="groups_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_classified.xml b/indra/newview/skins/default/xui/ja/panel_profile_classified.xml
new file mode 100644
index 0000000000..2d1bc07e2c
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_profile_classified.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_profile_classified">
+	<panel.string name="type_mature">
+		Moderate
+	</panel.string>
+	<panel.string name="type_pg">
+		General コンテンツ
+	</panel.string>
+	<panel.string name="l$_price">
+		L$[PRICE]
+	</panel.string>
+	<panel.string name="click_through_text_fmt">
+		[TELEPORT] テレポート、 [MAP] 地図、 [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">
+		有効
+	</panel.string>
+	<panel.string name="auto_renew_off">
+		無効
+	</panel.string>
+	<panel.string name="location_notice">
+		（掲載後更新）
+	</panel.string>
+	<string name="publish_label">
+		掲載
+	</string>
+	<string name="save_label">
+		保存
+	</string>
+	<scroll_container name="profile_scroll">
+		<panel name="info_scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="クリックして画像を選択"/>
+			<layout_stack name="info_panel">
+				<layout_panel name="main_info_panel">
+					<text_editor name="classified_name">
+						[name]
+					</text_editor>
+					<text name="classified_location_label" value="場所："/>
+					<text_editor name="classified_location" value="[loading...]"/>
+					<text name="content_type_label" value="コンテンツの種類："/>
+					<text_editor name="content_type" value="[content type]"/>
+					<text name="category_label" value="カテゴリ："/>
+					<text_editor name="category" value="[category]"/>
+					<text name="creation_date_label" value="制作日："/>
+					<text_editor name="creation_date" tool_tip="制作日" value="[date]"/>
+					<text name="price_for_listing_label" value="掲載価格："/>
+					<text_editor name="price_for_listing" tool_tip="掲載価格。">
+						[PRICE]
+					</text_editor>
+				</layout_panel>
+				<layout_panel name="clickthrough_layout_panel">
+					<text name="click_through_label" value="クリック数："/>
+					<text_editor name="click_through_text" tool_tip="クリックスルーデータ" value="[clicks]"/>
+				</layout_panel>
+				<layout_panel name="auto_renew_layout_panel">
+					<text name="auto_renew_label" value="自動更新："/>
+					<text name="auto_renew" value="有効"/>
+				</layout_panel>
+				<layout_panel name="descr_layout_panel">
+					<text name="classified_desc_label" value="説明："/>
+					<text_editor name="classified_desc" value="[description]"/>
+				</layout_panel>
+			</layout_stack>
+			<panel name="edit_panel">
+				<text name="Name:">
+					タイトル：
+				</text>
+				<text name="description_label">
+					説明：
+				</text>
+				<text name="location_label">
+					場所：
+				</text>
+				<text name="classified_location_edit">
+					ロード中...
+				</text>
+				<button label="現在地に設定" name="set_to_curr_location_btn"/>
+				<text name="category_label" value="カテゴリ："/>
+				<text name="content_type_label" value="コンテンツの種類："/>
+				<icons_combo_box label="General コンテンツ" name="content_type_edit">
+					<icons_combo_box.item label="Moderate コンテンツ" name="mature_ci" value="Mature"/>
+					<icons_combo_box.item label="General コンテンツ" name="pg_ci" value="PG"/>
+				</icons_combo_box>
+				<check_box label="毎週自動更新" name="auto_renew_edit"/>
+				<text name="price_for_listing_edit_label" value="掲載価格："/>
+				<spinner label="L$" name="price_for_listing_edit" tool_tip="掲載価格。" value="50"/>
+			</panel>
+		</panel>
+	</scroll_container>
+	<layout_stack name="edit_btns_pnl">
+		<layout_panel name="teleport_btn_lp">
+			<button label="テレポート" name="teleport_btn"/>
+		</layout_panel>
+		<layout_panel name="map_btn_lp">
+			<button label="地図" name="show_on_map_btn"/>
+		</layout_panel>
+		<layout_panel name="edit_btn_lp">
+			<button label="編集" name="edit_btn"/>
+		</layout_panel>
+		<layout_panel name="save_btn_lp">
+			<button label="[LABEL]" name="save_changes_btn"/>
+		</layout_panel>
+		<layout_panel name="cancel_btn_lp">
+			<button label="キャンセル" name="cancel_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml
new file mode 100644
index 0000000000..1980c0fa62
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="クラシファイド広告" name="panel_profile_classifieds">
+	<string name="no_classifieds" value="クラシファイド広告なし"/>
+	<button label="新規…" name="new_btn"/>
+	<button label="削除…" name="delete_btn"/>
+	<text name="classifieds_panel_text">
+		ロード中...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml
new file mode 100644
index 0000000000..a4ee262cb3
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="プロフィール" name="panel_profile_firstlife"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_interests.xml b/indra/newview/skins/default/xui/ja/panel_profile_interests.xml
new file mode 100644
index 0000000000..93cde6ffec
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_profile_interests.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="趣味" name="panel_profile_interests">
+	<text name="I Want To:">
+		次の内容を実行：
+	</text>
+	<check_box label="作る" name="chk0"/>
+	<check_box label="探検" name="chk1"/>
+	<check_box label="出会う" name="chk2"/>
+	<check_box label="雇ってもらう" name="chk6"/>
+	<check_box label="グループ" name="chk3"/>
+	<check_box label="買う" name="chk4"/>
+	<check_box label="販売する" name="chk5"/>
+	<check_box label="雇う" name="chk7"/>
+	<line_editor name="want_to_edit">
+		(ロード中...)
+	</line_editor>
+	<text name="Skills:">
+		スキル：
+	</text>
+	<check_box label="テクスチャ" name="schk0"/>
+	<check_box label="建築" name="schk1"/>
+	<check_box label="モデリング" name="schk3"/>
+	<check_box label="イベント計画" name="schk2"/>
+	<check_box label="スクリプト" name="schk4"/>
+	<check_box label="キャラクターのカスタマイズ" name="schk5"/>
+	<line_editor name="skills_edit">
+		(ロード中...)
+	</line_editor>
+	<text name="Languages:">
+		言語：
+	</text>
+	<line_editor name="languages_edit">
+		(ロード中...)
+	</line_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_notes.xml b/indra/newview/skins/default/xui/ja/panel_profile_notes.xml
new file mode 100644
index 0000000000..4b4e0d5e4e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_profile_notes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="メモとプライバシー" name="panel_notes">
+	<text name="status_message" value="このアバターのプライベートメモ："/>
+	<text name="status_message2" value="このアバターに次の許可を与える："/>
+	<check_box label="自分のオンラインステータスを表示する" name="status_check"/>
+	<check_box label="世界地図で自分を探せるようにする" name="map_check"/>
+	<check_box label="自分のオブジェクトを編集・削除・取得できるようにする" name="objects_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_pick.xml b/indra/newview/skins/default/xui/ja/panel_profile_pick.xml
new file mode 100644
index 0000000000..0a20c04ad6
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_profile_pick.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_pick_info">
+	<panel.string name="location_notice">
+		（掲載後更新）
+	</panel.string>
+	<line_editor name="pick_location">
+		ロード中...
+	</line_editor>
+	<button label="テレポート" name="teleport_btn"/>
+	<button label="地図に表示" name="show_on_map_btn"/>
+	<button label="場所を設定" name="set_to_curr_location_btn" tool_tip="現在地に設定"/>
+	<button label="ピックを保存" name="save_changes_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_picks.xml b/indra/newview/skins/default/xui/ja/panel_profile_picks.xml
new file mode 100644
index 0000000000..4cbfadd09d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_profile_picks.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="ピック" name="panel_picks">
+	<string name="no_picks" value="ピックなし"/>
+	<text name="Tell everyone about your favorite places in Second Life.">
+		Second Life のお気に入りの場所を紹介しましょう。
+	</text>
+	<button label="新規…" name="new_btn"/>
+	<button label="削除…" name="delete_btn"/>
+	<text name="picks_panel_text">
+		ロード中...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..5470dc6c82
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="プロフィール" name="panel_profile">
+	<string name="status_online">
+		オンライン中
+	</string>
+	<string name="status_offline">
+		オフライン中
+	</string>
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO]
+	</string>
+	<string name="payment_update_link_url">
+		http://www.secondlife.com/account/billing.php?lang=en
+	</string>
+	<string name="partner_edit_link_url">
+		http://www.secondlife.com/account/partners.php?lang=en
+	</string>
+	<string name="my_account_link_url" value="http://secondlife.com/account"/>
+	<string name="no_partner_text" value="なし"/>
+	<string name="no_group_text" value="なし"/>
+	<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="開発者"/>
+	<string name="FSSupp" value="サポート"/>
+	<string name="FSQualityAssurance" value="バグハンター"/>
+	<string name="FSGW" value="ゲートウェイ"/>
+	<text name="name_label" value="名前："/>
+	<button label="名前：" name="set_name" tool_tip="表示名を設定"/>
+	<panel name="name_holder">
+		<text_editor name="complete_name" value="(ロード中...)"/>
+	</panel>
+	<layout_stack name="imagepositioner">
+		<layout_panel name="label_stack">
+			<text name="status" value="ステータス不明"/>
+			<text name="label" value="Second Life 生年月日："/>
+			<text name="label2" value="アカウント："/>
+			<text name="partner_label" value="パートナー："/>
+		</layout_panel>
+	</layout_stack>
+	<text name="Groups:" value="グループ："/>
+	<button label="+" label_selected="+" name="group_invite" tool_tip="グループに招待"/>
+	<layout_stack name="aboutpositioner">
+		<layout_panel name="about_stack">
+			<text name="About:" value="詳細："/>
+		</layout_panel>
+		<layout_panel name="give_stack">
+			<text name="Give item:" value="アイテムを渡す："/>
+			<text name="Give inventory" tool_tip="インベントリのアイテムをここにドロップしてこの人に渡します。">
+				インベントリのアイテムをここにドロップしてください。
+			</text>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack name="buttonstack">
+		<layout_panel name="left_buttonstack">
+			<button label="地図上で見つける" label_selected="地図上で見つける" name="show_on_map_btn" tool_tip="住人を地図上で探す"/>
+			<button label="お金を払う" label_selected="お金を払う" name="pay" tool_tip="住人にお金を支払う"/>
+		</layout_panel>
+		<layout_panel name="middle_buttonstack">
+			<button label="テレポートを送る" label_selected="テレポートを送る" name="teleport" tool_tip="住人にテレポートを送る"/>
+			<button label="インスタントメッセージ" label_selected="インスタントメッセージ" name="im" tool_tip="インスタントメッセージを開きます"/>
+		</layout_panel>
+		<layout_panel name="right_buttonstack">
+			<button label="フレンド登録" label_selected="フレンド登録" name="add_friend" tool_tip="フレンド登録を申し出ます"/>
+			<button label="ブロック" name="block" tool_tip="この住人をブロックする"/>
+			<button label="ブロック解除" name="unblock" tool_tip="この住人のブロックを解除する"/>
+		</layout_panel>
+	</layout_stack>
+	<check_box label="検索に表示" name="show_in_search_checkbox"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_web.xml b/indra/newview/skins/default/xui/ja/panel_profile_web.xml
new file mode 100644
index 0000000000..4f56a7e98d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_profile_web.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Web" name="panel_profile_web">
+	<panel.string name="LoadTime" value="ロード時間：[TIME] 秒"/>
+	<line_editor name="url_edit">
+		(ロード中...)
+	</line_editor>
+	<flyout_button label="ロード" name="load" tool_tip="このプロフィールページを、組み込み Web ブラウザでロードします。">
+		<flyout_button.item label="ビューワ内のブラウザを開く" name="open_item"/>
+		<flyout_button.item label="外部ブラウザを開く" name="home_item"/>
+	</flyout_button>
+	<button name="web_profile_popout_btn" tool_tip="Web プロフィールのポップアウト"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
index 04dfc0176d..f222a4d61a 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
@@ -3,7 +3,7 @@
 	<button label="ディスクに保存" name="save_to_computer_btn"/>
 	<button label="持ち物に保存（L$[AMOUNT]）" name="save_to_inventory_btn"/>
 	<button label="プロフィールフィードで共有する" name="save_to_profile_btn"/>
-	<button label="Facebook で共有する" name="send_to_facebook_btn"/>
+	<button label="Facebook でシェア" name="send_to_facebook_btn"/>
 	<button label="Twitter で共有する" name="send_to_twitter_btn"/>
 	<button label="Flickr で共有する" name="send_to_flickr_btn"/>
 	<button label="メールにより送信" name="save_to_email_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 91d31faa76..d79531d266 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -357,6 +357,24 @@ support@secondlife.com にお問い合わせください。
 	<string name="TestingDisconnect">
 		ビューワの接続を切るテスト中
 	</string>
+	<string name="SocialFacebookConnecting">
+		Facebook に接続中...
+	</string>
+	<string name="SocialFacebookPosting">
+		投稿中...
+	</string>
+	<string name="SocialFacebookDisconnecting">
+		Facebook から切断中...
+	</string>
+	<string name="SocialFacebookErrorConnecting">
+		Facebook への接続時のエラー
+	</string>
+	<string name="SocialFacebookErrorPosting">
+		Facebook への投稿時のエラー
+	</string>
+	<string name="SocialFacebookErrorDisconnecting">
+		Facebook からの切断時のエラー
+	</string>
 	<string name="SocialFlickrConnecting">
 		Flickr に接続中...
 	</string>
@@ -2509,9 +2527,21 @@ support@secondlife.com にお問い合わせください。
 	<string name="NoPicksClassifiedsText">
 		ピックやクラシファイド広告を作成していません。 作成するには、下にある「プラス」ボタンをクリックします。
 	</string>
+	<string name="NoPicksText">
+		ピックを作成していません。[新規] ボタンをクリックしてピックを作成する。
+	</string>
+	<string name="NoClassifiedsText">
+		クラシファイド広告を作成していません。[新規] ボタンをクリックしてクラシファイド広告を作成する。
+	</string>
 	<string name="NoAvatarPicksClassifiedsText">
 		ピック、またはクラシファイド広告がありません
 	</string>
+	<string name="NoAvatarPicksText">
+		ピックがありません
+	</string>
+	<string name="NoAvatarClassifiedsText">
+		クラシファイド広告がありません
+	</string>
 	<string name="PicksClassifiedsLoadingText">
 		ローディング...
 	</string>
@@ -4489,6 +4519,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="share_alert">
 		インベントリからここにアイテムをドラッグします
 	</string>
+	<string name="facebook_post_success">
+		Facebook に投稿しました。
+	</string>
 	<string name="flickr_post_success">
 		Flickr に投稿しました。
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
index 3f66fd07b9..b31a066996 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
@@ -6,7 +6,7 @@
 	<check_box label="Gestos" name="check_gesture"/>
 	<check_box label="Landmarks" name="check_landmark"/>
 	<check_box label="Anotações" name="check_notecard"/>
-	<check_box label="Meshes:" name="check_mesh"/>
+	<check_box label="Malhas" name="check_mesh"/>
 	<check_box label="Objetos" name="check_object"/>
 	<check_box label="Scripts" name="check_script"/>
 	<check_box label="Sons" name="check_sound"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
index 6f39635240..90102023a3 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
@@ -6,42 +6,23 @@
 	<floater.string name="Copy">
 		Copiar para inventário
 	</floater.string>
-	<text name="desc txt">
-		Descrição:
-	</text>
-	<text name="dimensions">
-		[WIDTH]px x [HEIGHT]px
-	</text>
-	<text name="aspect_ratio">
-		Visualizar relação de aspecto
-	</text>
-	<combo_box name="combo_aspect_ratio" tool_tip="Visualizar com proporção de aspecto fixa">
-		<combo_item name="Unconstrained">
-			Sem limites
-		</combo_item>
-		<combo_item name="1:1" tool_tip="Símbolo ou perfil RW do grupo">
-			1:1
-		</combo_item>
-		<combo_item name="4:3" tool_tip="[SECOND_LIFE] perfil">
-			4:3
-		</combo_item>
-		<combo_item name="10:7" tool_tip="Procurar anúncios classificados e marcos">
-			10:7
-		</combo_item>
-		<combo_item name="3:2" tool_tip="Sobre terrenos">
-			3:2
-		</combo_item>
-		<combo_item name="16:10">
-			16:10
-		</combo_item>
-		<combo_item name="16:9" tool_tip="Perfis destacados">
-			16:9
-		</combo_item>
-		<combo_item name="2:1">
-			2:1
-		</combo_item>
-	</combo_box>
-	<button label="OK" name="Keep"/>
-	<button label="Descartar" name="Discard"/>
-	<button label="Salvar como" name="save_tex_btn"/>
+	<layout_stack name="preview_stack">
+		<layout_panel name="texture_panel">
+			<text name="desc txt">
+				Descrição:
+			</text>
+			<text name="dimensions">
+				[WIDTH]px x [HEIGHT]px
+			</text>
+			<text name="aspect_ratio">
+				Visualizar relação de aspecto
+			</text>
+			<combo_box name="combo_aspect_ratio" tool_tip="Visualizar com proporção de aspecto fixa"/>
+		</layout_panel>
+		<layout_panel name="buttons_panel">
+			<button label="OK" name="Keep"/>
+			<button label="Descartar" name="Discard"/>
+			<button label="Salvar como" name="save_tex_btn"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_profile.xml b/indra/newview/skins/default/xui/pt/floater_profile.xml
new file mode 100644
index 0000000000..0327211d8f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_profile.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarinfo" title="Perfil">
+	<panel name="panel_profile_view">
+		<tab_container name="panel_profile_tabs">
+			<panel label="Second Life" name="panel_profile_secondlife"/>
+			<panel label="Web" name="panel_profile_web"/>
+			<panel label="Interesses" name="panel_profile_interests"/>
+			<panel label="Destaques" name="panel_profile_picks"/>
+			<panel label="Anúncio" name="panel_profile_classifieds"/>
+			<panel label="Vida real" name="panel_profile_firstlife"/>
+			<panel label="Observações" name="panel_profile_notes"/>
+		</tab_container>
+		<button label="OK" name="ok_btn" tool_tip="Salvar alterações do perfil e fechar"/>
+		<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
index e3812ed708..89901b539f 100644
--- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
@@ -6,6 +6,9 @@
 	<string name="postcard_progress_str">
 		Enviando e-mail
 	</string>
+	<string name="facebook_progress_str">
+		Como publicar no Facebook
+	</string>
 	<string name="profile_progress_str">
 		Postando
 	</string>
@@ -15,6 +18,9 @@
 	<string name="local_progress_str">
 		Salvo no computador
 	</string>
+	<string name="facebook_succeeded_str">
+		Imagem carregada
+	</string>
 	<string name="profile_succeeded_str">
 		Imagem carregada
 	</string>
@@ -27,6 +33,9 @@
 	<string name="local_succeeded_str">
 		Salvo no computador!
 	</string>
+	<string name="facebook_failed_str">
+		Falha ao carregar a imagem na sua linha do tempo no Facebook.
+	</string>
 	<string name="profile_failed_str">
 		Falha ao carregar a imagem no feed do seu perfil.
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/menu_name_field.xml b/indra/newview/skins/default/xui/pt/menu_name_field.xml
new file mode 100644
index 0000000000..2157de9813
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_name_field.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="CopyMenu">
+	<menu_item_call label="Exibir Cópia do Nome" name="copy_display"/>
+	<menu_item_call label="Copiar Nome do Agente" name="copy_name"/>
+	<menu_item_call label="Copiar Id do Agente" name="copy_id"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 478af96e95..e6efa2bdda 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -2650,6 +2650,9 @@ Selecione só um objeto.
 	<notification name="SystemMessage">
 		[MESSAGE]
 	</notification>
+	<notification name="FacebookConnect">
+		[MESSAGE]
+	</notification>
 	<notification name="FlickrConnect">
 		[MESSAGE]
 	</notification>
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml
index 23e00bfc3a..7b27c811f5 100644
--- a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml
@@ -46,7 +46,7 @@
 			<layout_panel name="save_changes_btn_lp">
 				<button label="[LABEL]" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="show_on_map_btn_lp">
+			<layout_panel name="cancel_btn_lp">
 				<button label="Cancelar" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml
index b634ec3f64..f6c6d11b87 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml
@@ -46,7 +46,7 @@ Para obter mais ajuda, passe o mouse sobre as opções.
 		<check_box label="Qualquer um pode entrar" name="open_enrollement" tool_tip="Controla a entrada de novos membros, com ou sem convite."/>
 		<check_box label="Taxa de inscrição" name="check_enrollment_fee" tool_tip="Controla a cobrança de uma taxa de associação ao grupo."/>
 		<spinner label="L$" left_delta="120" name="spin_enrollment_fee" tool_tip="Se a opção &apos;Taxa de associação&apos; estiver marcada, novos membros precisam pagar o valor definido para entrar no grupo." width="60"/>
-		<combo_box name="group_mature_check" tool_tip="Define se os dados do seu grupo são conteúdo moderado." width="170">
+		<combo_box name="group_mature_check" tool_tip="Definir se o seu grupo contém informações classificadas como Moderado" width="170">
 			<combo_item name="select_mature">
 				- Selecione o nível de maturidade -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/pt/panel_group_list_item_short.xml
new file mode 100644
index 0000000000..0490878507
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_group_list_item_short.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="group_list_item">
+	<text name="group_name" value="Desconhecido"/>
+	<button name="info_btn" tool_tip="Mais informações"/>
+	<button name="profile_btn" tool_tip="Ver perfil"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index fce170110e..930279f7c8 100644
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -40,6 +40,7 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Todos"/>
+				<accordion_tab name="tab_suggested_friends" title="Pessoas que talvez você deseje adicionar"/>
 			</accordion>
 		</panel>
 		<panel label="GRUPOS" name="groups_panel">
diff --git a/indra/newview/skins/default/xui/pt/panel_profile_classified.xml b/indra/newview/skins/default/xui/pt/panel_profile_classified.xml
new file mode 100644
index 0000000000..b43a0ad9f2
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_profile_classified.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_profile_classified">
+	<panel.string name="type_mature">
+		Moderado
+	</panel.string>
+	<panel.string name="type_pg">
+		Conteúdo Geral
+	</panel.string>
+	<panel.string name="l$_price">
+		L$[PRICE]-
+	</panel.string>
+	<panel.string name="click_through_text_fmt">
+		[TELEPORT] teletransporte, [MAP] mapa, [PROFILE] perfil
+	</panel.string>
+	<panel.string name="date_fmt">
+		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+	</panel.string>
+	<panel.string name="auto_renew_on">
+		Ativado
+	</panel.string>
+	<panel.string name="auto_renew_off">
+		Desativado
+	</panel.string>
+	<panel.string name="location_notice">
+		(salvar para atualizar)
+	</panel.string>
+	<string name="publish_label">
+		Publicar
+	</string>
+	<string name="save_label">
+		Salvar
+	</string>
+	<scroll_container name="profile_scroll">
+		<panel name="info_scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="Selecione uma imagem"/>
+			<layout_stack name="info_panel">
+				<layout_panel name="main_info_panel">
+					<text_editor name="classified_name">
+						[name]
+					</text_editor>
+					<text name="classified_location_label" value="Localização:"/>
+					<text_editor name="classified_location" value="[loading...]"/>
+					<text name="content_type_label" value="Tipo de conteúdo:"/>
+					<text_editor name="content_type" value="[content type]"/>
+					<text name="category_label" value="Categoria:"/>
+					<text_editor name="category" value="[category]"/>
+					<text name="creation_date_label" value="Data de criação:"/>
+					<text_editor name="creation_date" tool_tip="Data de criação" value="[date]"/>
+					<text name="price_for_listing_label" value="Preço do anúncio:"/>
+					<text_editor name="price_for_listing" tool_tip="Preço do anúncio.">
+						[PRICE]
+					</text_editor>
+				</layout_panel>
+				<layout_panel name="clickthrough_layout_panel">
+					<text name="click_through_label" value="Cliques:"/>
+					<text_editor name="click_through_text" tool_tip="Dados de click-through" value="[clicks]"/>
+				</layout_panel>
+				<layout_panel name="auto_renew_layout_panel">
+					<text name="auto_renew_label" value="Renovação automática:"/>
+					<text name="auto_renew" value="Ativado"/>
+				</layout_panel>
+				<layout_panel name="descr_layout_panel">
+					<text name="classified_desc_label" value="Descrição:"/>
+					<text_editor name="classified_desc" value="[description]"/>
+				</layout_panel>
+			</layout_stack>
+			<panel name="edit_panel">
+				<text name="Name:">
+					Título:
+				</text>
+				<text name="description_label">
+					Descrição:
+				</text>
+				<text name="location_label">
+					Localização:
+				</text>
+				<text name="classified_location_edit">
+					Carregando...
+				</text>
+				<button label="Usar configuração local" name="set_to_curr_location_btn"/>
+				<text name="category_label" value="Categoria:"/>
+				<text name="content_type_label" value="Tipo de conteúdo:"/>
+				<icons_combo_box label="Conteúdo Geral" name="content_type_edit">
+					<icons_combo_box.item label="Conteúdo Moderado" name="mature_ci" value="Moderado"/>
+					<icons_combo_box.item label="Conteúdo Geral" name="pg_ci" value="Adequado para menores"/>
+				</icons_combo_box>
+				<check_box label="Renovar automaticamente todas as semanas" name="auto_renew_edit"/>
+				<text name="price_for_listing_edit_label" value="Preço do anúncio:"/>
+				<spinner label="L$" name="price_for_listing_edit" tool_tip="Preço do anúncio." value="50"/>
+			</panel>
+		</panel>
+	</scroll_container>
+	<layout_stack name="edit_btns_pnl">
+		<layout_panel name="teleport_btn_lp">
+			<button label="Teletransportar" name="teleport_btn"/>
+		</layout_panel>
+		<layout_panel name="map_btn_lp">
+			<button label="Mapa" name="show_on_map_btn"/>
+		</layout_panel>
+		<layout_panel name="edit_btn_lp">
+			<button label="Editar" name="edit_btn"/>
+		</layout_panel>
+		<layout_panel name="save_btn_lp">
+			<button label="[LABEL]" name="save_changes_btn"/>
+		</layout_panel>
+		<layout_panel name="cancel_btn_lp">
+			<button label="Cancelar" name="cancel_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/pt/panel_profile_classifieds.xml
new file mode 100644
index 0000000000..f8369954fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_profile_classifieds.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Anúncio" name="panel_profile_classifieds">
+	<string name="no_classifieds" value="Nenhum classificado"/>
+	<button label="Novo..." name="new_btn"/>
+	<button label="Excluir..." name="delete_btn"/>
+	<text name="classifieds_panel_text">
+		Carregando...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/pt/panel_profile_firstlife.xml
new file mode 100644
index 0000000000..0fb502e441
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_profile_firstlife.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Perfil" name="panel_profile_firstlife"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile_interests.xml b/indra/newview/skins/default/xui/pt/panel_profile_interests.xml
new file mode 100644
index 0000000000..edf74115f2
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_profile_interests.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Interesses" name="panel_profile_interests">
+	<text name="I Want To:">
+		Quero:
+	</text>
+	<check_box label="Crie" name="chk0"/>
+	<check_box label="Explore" name="chk1"/>
+	<check_box label="Encontrar" name="chk2"/>
+	<check_box label="Seja contratado" name="chk6"/>
+	<check_box label="Grupo" name="chk3"/>
+	<check_box label="Comprar" name="chk4"/>
+	<check_box label="Venda" name="chk5"/>
+	<check_box label="Contratar" name="chk7"/>
+	<line_editor name="want_to_edit">
+		(carregando...)
+	</line_editor>
+	<text name="Skills:">
+		Habilidades:
+	</text>
+	<check_box label="Texturas" name="schk0"/>
+	<check_box label="Arquitetura" name="schk1"/>
+	<check_box label="Modelo" name="schk3"/>
+	<check_box label="Planejamento de evento" name="schk2"/>
+	<check_box label="Scripts" name="schk4"/>
+	<check_box label="Personagens personalizados" name="schk5"/>
+	<line_editor name="skills_edit">
+		(carregando...)
+	</line_editor>
+	<text name="Languages:">
+		Idiomas:
+	</text>
+	<line_editor name="languages_edit">
+		(carregando...)
+	</line_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile_notes.xml b/indra/newview/skins/default/xui/pt/panel_profile_notes.xml
new file mode 100644
index 0000000000..499e371bb7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_profile_notes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Anotações e Privacidade" name="panel_notes">
+	<text name="status_message" value="Notas particulares neste avatar:"/>
+	<text name="status_message2" value="Permitir que esse avatar:"/>
+	<check_box label="Ver quando eu estiver conectado" name="status_check"/>
+	<check_box label="Encontre-me no mapa-múndi" name="map_check"/>
+	<check_box label="Pegar, editar ou excluir objetos meus" name="objects_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile_pick.xml b/indra/newview/skins/default/xui/pt/panel_profile_pick.xml
new file mode 100644
index 0000000000..2dd37b38f9
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_profile_pick.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_pick_info">
+	<panel.string name="location_notice">
+		(salvar para atualizar)
+	</panel.string>
+	<line_editor name="pick_location">
+		Carregando...
+	</line_editor>
+	<button label="Teletransportar" name="teleport_btn"/>
+	<button label="Mostrar no mapa" name="show_on_map_btn"/>
+	<button label="Definir Localização" name="set_to_curr_location_btn" tool_tip="Usar configuração local"/>
+	<button label="Salvar destaque" name="save_changes_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile_picks.xml b/indra/newview/skins/default/xui/pt/panel_profile_picks.xml
new file mode 100644
index 0000000000..f9ead974dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_profile_picks.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Destaques" name="panel_picks">
+	<string name="no_picks" value="Nenhum"/>
+	<text name="Tell everyone about your favorite places in Second Life.">
+		Conte a todos sobre os seu lugares favoritos no Second Life.
+	</text>
+	<button label="Novo..." name="new_btn"/>
+	<button label="Excluir..." name="delete_btn"/>
+	<text name="picks_panel_text">
+		Carregando...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/pt/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..8723b1bf58
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_profile_secondlife.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Perfil" name="panel_profile">
+	<string name="status_online">
+		Atualmente Online
+	</string>
+	<string name="status_offline">
+		Atualmente Offline
+	</string>
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO]
+	</string>
+	<string name="payment_update_link_url">
+		http://www.secondlife.com/account/billing.php?lang=en
+	</string>
+	<string name="partner_edit_link_url">
+		http://www.secondlife.com/account/partners.php?lang=en
+	</string>
+	<string name="my_account_link_url" value="http://secondlife.com/account"/>
+	<string name="no_partner_text" value="Nenhum"/>
+	<string name="no_group_text" value="Nenhum"/>
+	<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="Desenvolvedor"/>
+	<string name="FSSupp" value="Suporte"/>
+	<string name="FSQualityAssurance" value="Caçador de Bug"/>
+	<string name="FSGW" value="Gateway"/>
+	<text name="name_label" value="Nome:"/>
+	<button label="Nome:" name="set_name" tool_tip="Definir nome de tela"/>
+	<panel name="name_holder">
+		<text_editor name="complete_name" value="(carregando...)"/>
+	</panel>
+	<layout_stack name="imagepositioner">
+		<layout_panel name="label_stack">
+			<text name="status" value="Status desconhecido"/>
+			<text name="label" value="Aniversário Second Life:"/>
+			<text name="label2" value="Conta:"/>
+			<text name="partner_label" value="Parceiro(a):"/>
+		</layout_panel>
+	</layout_stack>
+	<text name="Groups:" value="Grupos:"/>
+	<button label="+" label_selected="+" name="group_invite" tool_tip="Convidar para entrar no grupo"/>
+	<layout_stack name="aboutpositioner">
+		<layout_panel name="about_stack">
+			<text name="About:" value="Sobre:"/>
+		</layout_panel>
+		<layout_panel name="give_stack">
+			<text name="Give item:" value="Dar o item:"/>
+			<text name="Give inventory" tool_tip="Arraste e solte o item novo do inventário aqui para dá-los a esta pessoa.">
+				Arraste e solte o item novo do inventário aqui.
+			</text>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack name="buttonstack">
+		<layout_panel name="left_buttonstack">
+			<button label="Localizar no mapa" label_selected="Localizar no mapa" name="show_on_map_btn" tool_tip="Localizar o Residente no mapa"/>
+			<button label="Pagar" label_selected="Pagar" name="pay" tool_tip="Pague em dinheiro para o Residente"/>
+		</layout_panel>
+		<layout_panel name="middle_buttonstack">
+			<button label="Teletransportar?" label_selected="Teletransportar?" name="teleport" tool_tip="Oferecer teletransporte ao Residente"/>
+			<button label="Mensagem instantânea" label_selected="Mensagem instantânea" name="im" tool_tip="Abrir sessão de mensagem instantânea"/>
+		</layout_panel>
+		<layout_panel name="right_buttonstack">
+			<button label="Adicionar amigo" label_selected="Adicionar amigo" name="add_friend" tool_tip="Oferecer amizade ao residente"/>
+			<button label="Bloquear" name="block" tool_tip="Bloquear este Residente"/>
+			<button label="Desbloquear" name="unblock" tool_tip="Desbloquear este Residente"/>
+		</layout_panel>
+	</layout_stack>
+	<check_box label="Mostrar nos resultados de busca" name="show_in_search_checkbox"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile_web.xml b/indra/newview/skins/default/xui/pt/panel_profile_web.xml
new file mode 100644
index 0000000000..0f556c7dad
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_profile_web.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Web" name="panel_profile_web">
+	<panel.string name="LoadTime" value="Carregar tempo: [TIME] segundos"/>
+	<line_editor name="url_edit">
+		(carregando..)
+	</line_editor>
+	<flyout_button label="Carregar" name="load" tool_tip="Carregar esta página de perfil com navegador embutido">
+		<flyout_button.item label="Abrir no visualizador do navegador" name="open_item"/>
+		<flyout_button.item label="Abrir no navegador externo" name="home_item"/>
+	</flyout_button>
+	<button name="web_profile_popout_btn" tool_tip="Abra o perfil da web"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index c4fbf1f4c9..84201ba050 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -314,6 +314,24 @@ Aguarde um minuto antes que tentar logar-se novamente.
 	<string name="TestingDisconnect">
 		Teste de desconexão
 	</string>
+	<string name="SocialFacebookConnecting">
+		Conectando ao Facebook...
+	</string>
+	<string name="SocialFacebookPosting">
+		Publicando...
+	</string>
+	<string name="SocialFacebookDisconnecting">
+		Desconectando do Facebook...
+	</string>
+	<string name="SocialFacebookErrorConnecting">
+		Problema ao conectar ao Facebook
+	</string>
+	<string name="SocialFacebookErrorPosting">
+		Problema ao publicar no Facebook
+	</string>
+	<string name="SocialFacebookErrorDisconnecting">
+		Problema ao desconectar do Facebook
+	</string>
 	<string name="SocialFlickrConnecting">
 		Conectando ao Flickr...
 	</string>
@@ -2449,9 +2467,21 @@ Se você continuar a receber essa mensagem, entre em contato com o suporte do Se
 	<string name="NoPicksClassifiedsText">
 		Você não criou nenhum Destaque ou Anúncio.  Clique no botão &quot;+&quot; para criar um Destaque ou Anúncio.
 	</string>
+	<string name="NoPicksText">
+		Você não criou nenhuma Escolha. Clique em Novo Botão para criar um Escolher
+	</string>
+	<string name="NoClassifiedsText">
+		Você criou nenhum Anúncio. Clique em Novo Botão para criar um Classificado
+	</string>
 	<string name="NoAvatarPicksClassifiedsText">
 		O usuário não tem nenhum destaque ou anúncio
 	</string>
+	<string name="NoAvatarPicksText">
+		Usuário não tem escolha
+	</string>
+	<string name="NoAvatarClassifiedsText">
+		Usuário não tem anúncio
+	</string>
 	<string name="PicksClassifiedsLoadingText">
 		Carregando...
 	</string>
@@ -4365,6 +4395,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="inventory_folder_offered-im">
 		Pasta do inventário &apos;[ITEM_NAME]&apos; oferecida
 	</string>
+	<string name="facebook_post_success">
+		Você publicou no Facebook.
+	</string>
 	<string name="flickr_post_success">
 		Você publicou no Flickr.
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
index ce6b89cb82..174ad6b1ce 100644
--- a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
@@ -6,7 +6,7 @@
 	<check_box label="Жесты" name="check_gesture"/>
 	<check_box label="Закладки" name="check_landmark"/>
 	<check_box label="Заметки" name="check_notecard"/>
-	<check_box label="Меши" name="check_mesh"/>
+	<check_box label="Полисетки" name="check_mesh"/>
 	<check_box label="Объекты" name="check_object"/>
 	<check_box label="Скрипты" name="check_script"/>
 	<check_box label="Звуки" name="check_sound"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_texture.xml b/indra/newview/skins/default/xui/ru/floater_preview_texture.xml
index c9cb87282a..e3921a75ac 100644
--- a/indra/newview/skins/default/xui/ru/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preview_texture.xml
@@ -6,42 +6,23 @@
 	<floater.string name="Copy">
 		Копировать в инвентарь
 	</floater.string>
-	<text name="desc txt">
-		Описание:
-	</text>
-	<text name="dimensions">
-		[WIDTH]x[HEIGHT] пикселей
-	</text>
-	<text name="aspect_ratio">
-		Соотношение сторон
-	</text>
-	<combo_box name="combo_aspect_ratio" tool_tip="Просмотр изображения с другим соотношением сторон">
-		<combo_item name="Unconstrained">
-			Без ограничения
-		</combo_item>
-		<combo_item name="1:1" tool_tip="Символ группы или профиль в реальном мире">
-			1:1
-		</combo_item>
-		<combo_item name="4:3" tool_tip="Профиль для [SECOND_LIFE]">
-			4:3
-		</combo_item>
-		<combo_item name="10:7" tool_tip="Реклама, поиск и закладки">
-			10:7
-		</combo_item>
-		<combo_item name="3:2" tool_tip="О земле">
-			3:2
-		</combo_item>
-		<combo_item name="16:10">
-			16:10
-		</combo_item>
-		<combo_item name="16:9" tool_tip="Профиль подборки">
-			16:9
-		</combo_item>
-		<combo_item name="2:1">
-			2:1
-		</combo_item>
-	</combo_box>
-	<button label="OK" name="Keep"/>
-	<button label="Удалить" name="Discard"/>
-	<button label="Сохранить как" name="save_tex_btn"/>
+	<layout_stack name="preview_stack">
+		<layout_panel name="texture_panel">
+			<text name="desc txt">
+				Описание:
+			</text>
+			<text name="dimensions">
+				[WIDTH]пикселей x [HEIGHT]пикселей
+			</text>
+			<text name="aspect_ratio">
+				Предварительный просмотр соотношения сторон
+			</text>
+			<combo_box name="combo_aspect_ratio" tool_tip="Просмотр изображения с фиксированным соотношением сторон"/>
+		</layout_panel>
+		<layout_panel name="buttons_panel">
+			<button label="OK" name="Keep"/>
+			<button label="Сбросить" name="Discard"/>
+			<button label="Сохранить как" name="save_tex_btn"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_profile.xml b/indra/newview/skins/default/xui/ru/floater_profile.xml
new file mode 100644
index 0000000000..6f8daf0a62
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_profile.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarinfo" title="Профиль">
+	<panel name="panel_profile_view">
+		<tab_container name="panel_profile_tabs">
+			<panel label="Second Life" name="panel_profile_secondlife"/>
+			<panel label="Веб" name="panel_profile_web"/>
+			<panel label="Круг интересов" name="panel_profile_interests"/>
+			<panel label="Подборка" name="panel_profile_picks"/>
+			<panel label="Объявление" name="panel_profile_classifieds"/>
+			<panel label="Реальная жизнь" name="panel_profile_firstlife"/>
+			<panel label="Примечания" name="panel_profile_notes"/>
+		</tab_container>
+		<button label="OK" name="ok_btn" tool_tip="Сохранить изменения в профиле и закрыть"/>
+		<button label="Отменить" label_selected="Отменить" name="cancel_btn"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_report_abuse.xml b/indra/newview/skins/default/xui/ru/floater_report_abuse.xml
index 67d847aa6b..89a453d9cd 100644
--- a/indra/newview/skins/default/xui/ru/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ru/floater_report_abuse.xml
@@ -67,7 +67,7 @@
 		<combo_box.item label="Земля &gt; Посягательство &gt; Объекты или текстуры" name="Land__Encroachment__Objects_textures"/>
 		<combo_box.item label="Земля &gt; Посягательство &gt; Частицы" name="Land__Encroachment__Particles"/>
 		<combo_box.item label="Земля &gt; Посягательство &gt; Деревья/растения" name="Land__Encroachment__Trees_plants"/>
-		<combo_box.item label="Нарушение политики игр" name="Wagering_gambling"/>
+		<combo_box.item label="Нарушение игровых правил" name="Wagering_gambling"/>
 		<combo_box.item label="Другое" name="Other"/>
 	</combo_box>
 	<text name="abuser_name_title">
diff --git a/indra/newview/skins/default/xui/ru/floater_snapshot.xml b/indra/newview/skins/default/xui/ru/floater_snapshot.xml
index 97de279b8f..a796d942f3 100644
--- a/indra/newview/skins/default/xui/ru/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ru/floater_snapshot.xml
@@ -6,6 +6,9 @@
 	<string name="postcard_progress_str">
 		Отправка письма
 	</string>
+	<string name="facebook_progress_str">
+		Публикация в Facebook
+	</string>
 	<string name="profile_progress_str">
 		Публикация
 	</string>
@@ -15,6 +18,9 @@
 	<string name="local_progress_str">
 		Сохранение на компьютере
 	</string>
+	<string name="facebook_succeeded_str">
+		Изображение загружено
+	</string>
 	<string name="profile_succeeded_str">
 		Изображение отправлено
 	</string>
@@ -27,6 +33,9 @@
 	<string name="local_succeeded_str">
 		Сохранено на компьютере!
 	</string>
+	<string name="facebook_failed_str">
+		Не удалось передать изображение на вашу хронику Facebook.
+	</string>
 	<string name="profile_failed_str">
 		Не удалось передать изображение в ваш профиль.
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/menu_name_field.xml b/indra/newview/skins/default/xui/ru/menu_name_field.xml
new file mode 100644
index 0000000000..889f3c37ab
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_name_field.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="CopyMenu">
+	<menu_item_call label="Копировать отображаемое имя" name="copy_display"/>
+	<menu_item_call label="Копировать имя агента" name="copy_name"/>
+	<menu_item_call label="Копировать Id агента" name="copy_id"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 08accc39fe..e74fe374d2 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -2659,6 +2659,9 @@
 	<notification name="SystemMessage">
 		[MESSAGE]
 	</notification>
+	<notification name="FacebookConnect">
+		[MESSAGE]
+	</notification>
 	<notification name="FlickrConnect">
 		[MESSAGE]
 	</notification>
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_classified.xml b/indra/newview/skins/default/xui/ru/panel_edit_classified.xml
index a2f06dbadf..ec457c4565 100644
--- a/indra/newview/skins/default/xui/ru/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_classified.xml
@@ -46,8 +46,8 @@
 			<layout_panel name="save_changes_btn_lp">
 				<button label="[LABEL]" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="show_on_map_btn_lp">
-				<button label="Отмена" name="cancel_btn"/>
+			<layout_panel name="cancel_btn_lp">
+				<button label="Отменить" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
 	</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_facebook_friends.xml b/indra/newview/skins/default/xui/ru/panel_facebook_friends.xml
index 746da8d523..1e4d1346f7 100644
--- a/indra/newview/skins/default/xui/ru/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/ru/panel_facebook_friends.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_facebook_friends">
-	<string name="facebook_friends_empty" value="Сейчас у вас нет друзей по Facebook, которые также были бы жителями Second Life. Предложите своим друзьям по Facebook присоединиться к Second Life!"/>
+	<string name="facebook_friends_empty" value="Сейчас у вас нет друзей в Facebook, которые являются также жителями Second Life. Предложите своим друзьям в Facebook присоединиться к Second Life!"/>
 	<string name="facebook_friends_no_connected" value="Сейчас вы не подключены к Facebook. Перейдите на вкладку «Статус», чтобы подключиться и включить эту функцию."/>
 	<accordion name="friends_accordion">
 		<accordion_tab name="tab_second_life_friends" title="Друзья по SL"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_facebook_photo.xml b/indra/newview/skins/default/xui/ru/panel_facebook_photo.xml
index 143a57fec7..50296778ff 100644
--- a/indra/newview/skins/default/xui/ru/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/ru/panel_facebook_photo.xml
@@ -2,19 +2,19 @@
 <panel name="panel_facebook_photo">
 	<combo_box name="resolution_combobox" tool_tip="Разрешение изображения">
 		<combo_box.item label="Текущее окно" name="CurrentWindow"/>
-		<combo_box.item label="640x480" name="640x480"/>
-		<combo_box.item label="800x600" name="800x600"/>
-		<combo_box.item label="1024x768" name="1024x768"/>
-		<combo_box.item label="1200x630" name="1200x630"/>
+		<combo_box.item label="640 x 480" name="640x480"/>
+		<combo_box.item label="800 x 600" name="800x600"/>
+		<combo_box.item label="1024 x 768" name="1024x768"/>
+		<combo_box.item label="1200 x 630" name="1200x630"/>
 	</combo_box>
 	<combo_box name="filters_combobox" tool_tip="Фильтры изображений">
 		<combo_box.item label="Без фильтра" name="NoFilter"/>
 	</combo_box>
-	<button label="Обновить" name="new_snapshot_btn" tool_tip="Щелкните для обновления"/>
-	<button label="Просмотр" name="big_preview_btn" tool_tip="Щелкните для смены вида"/>
+	<button label="Обновить" name="new_snapshot_btn" tool_tip="Щелкнуть для обновления"/>
+	<button label="Предпросмотр" name="big_preview_btn" tool_tip="Щелкнуть для смены вида"/>
 	<text name="caption_label">
 		Комментарий (не обязательно):
 	</text>
 	<button label="Опубликовать" name="post_photo_btn"/>
-	<button label="Отмена" name="cancel_photo_btn"/>
+	<button label="Отменить" name="cancel_photo_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_facebook_place.xml b/indra/newview/skins/default/xui/ru/panel_facebook_place.xml
index 7d0917a43a..a7fadca059 100644
--- a/indra/newview/skins/default/xui/ru/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/ru/panel_facebook_place.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_facebook_place">
 	<text name="place_caption_label">
-		Напишите о том, где вы:
+		Сообщите, где вы находитесь:
 	</text>
 	<check_box initial_value="false" label="Включить вид места сверху" name="add_place_view_cb"/>
 	<button label="Опубликовать" name="post_place_btn"/>
-	<button label="Отмена" name="cancel_place_btn"/>
+	<button label="Отменить" name="cancel_place_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_facebook_status.xml b/indra/newview/skins/default/xui/ru/panel_facebook_status.xml
index c651a8087c..826ac6a08c 100644
--- a/indra/newview/skins/default/xui/ru/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/ru/panel_facebook_status.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_facebook_status">
 	<string name="facebook_connected" value="Вы подключились к Facebook как:"/>
-	<string name="facebook_disconnected" value="Не подключено к Facebook"/>
+	<string name="facebook_disconnected" value="Нет подключения к Facebook"/>
 	<text name="account_caption_label">
-		Не подключено к Facebook.
+		Нет подключения к Facebook.
 	</text>
 	<panel name="panel_buttons">
-		<button label="Подключение..." name="connect_btn"/>
-		<button label="Отключить" name="disconnect_btn"/>
+		<button label="Соединение..." name="connect_btn"/>
+		<button label="Разъединить" name="disconnect_btn"/>
 		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 О публикации в Facebook]
+			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Узнать о публикации в Facebook]
 		</text>
 	</panel>
 	<text name="status_caption_label">
 		О чем вы думаете?
 	</text>
 	<button label="Опубликовать" name="post_status_btn"/>
-	<button label="Отмена" name="cancel_status_btn"/>
+	<button label="Отменить" name="cancel_status_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/ru/panel_group_list_item_short.xml
new file mode 100644
index 0000000000..3408969d09
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_group_list_item_short.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="group_list_item">
+	<text name="group_name" value="Неизвестно"/>
+	<button name="info_btn" tool_tip="Больше информации"/>
+	<button name="profile_btn" tool_tip="Посмотреть профиль"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml
index 0fdc06fb32..05b7997e5d 100644
--- a/indra/newview/skins/default/xui/ru/panel_people.xml
+++ b/indra/newview/skins/default/xui/ru/panel_people.xml
@@ -40,6 +40,7 @@
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Онлайн"/>
 				<accordion_tab name="tab_all" title="Все"/>
+				<accordion_tab name="tab_suggested_friends" title="С кем вы можете подружиться"/>
 			</accordion>
 		</panel>
 		<panel label="ГРУППЫ" name="groups_panel">
diff --git a/indra/newview/skins/default/xui/ru/panel_profile_classified.xml b/indra/newview/skins/default/xui/ru/panel_profile_classified.xml
new file mode 100644
index 0000000000..2d3ed685c0
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_profile_classified.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_profile_classified">
+	<panel.string name="type_mature">
+		Умеренная
+	</panel.string>
+	<panel.string name="type_pg">
+		Общий контент
+	</panel.string>
+	<panel.string name="l$_price">
+		L$[PRICE]
+	</panel.string>
+	<panel.string name="click_through_text_fmt">
+		Телепорт [TELEPORT], карта [MAP], профиль [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">
+		Включен
+	</panel.string>
+	<panel.string name="auto_renew_off">
+		Отключен
+	</panel.string>
+	<panel.string name="location_notice">
+		(будет обновлено после сохранения)
+	</panel.string>
+	<string name="publish_label">
+		Опубликовать
+	</string>
+	<string name="save_label">
+		Сохранить
+	</string>
+	<scroll_container name="profile_scroll">
+		<panel name="info_scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="Щелкнуть для выбора изображения"/>
+			<layout_stack name="info_panel">
+				<layout_panel name="main_info_panel">
+					<text_editor name="classified_name">
+						[name]
+					</text_editor>
+					<text name="classified_location_label" value="Местоположение:"/>
+					<text_editor name="classified_location" value="[loading...]"/>
+					<text name="content_type_label" value="Тип контента:"/>
+					<text_editor name="content_type" value="[content type]"/>
+					<text name="category_label" value="Категория:"/>
+					<text_editor name="category" value="[category]"/>
+					<text name="creation_date_label" value="Дата создания:"/>
+					<text_editor name="creation_date" tool_tip="Дата создания" value="[date]"/>
+					<text name="price_for_listing_label" value="Стоимость размещения:"/>
+					<text_editor name="price_for_listing" tool_tip="Цена за размещение.">
+						[PRICE]
+					</text_editor>
+				</layout_panel>
+				<layout_panel name="clickthrough_layout_panel">
+					<text name="click_through_label" value="Клики:"/>
+					<text_editor name="click_through_text" tool_tip="Информация о переходах" value="[clicks]"/>
+				</layout_panel>
+				<layout_panel name="auto_renew_layout_panel">
+					<text name="auto_renew_label" value="Автоматическое продление:"/>
+					<text name="auto_renew" value="Включен"/>
+				</layout_panel>
+				<layout_panel name="descr_layout_panel">
+					<text name="classified_desc_label" value="Описание:"/>
+					<text_editor name="classified_desc" value="[description]"/>
+				</layout_panel>
+			</layout_stack>
+			<panel name="edit_panel">
+				<text name="Name:">
+					Название:
+				</text>
+				<text name="description_label">
+					Описание:
+				</text>
+				<text name="location_label">
+					Местоположение:
+				</text>
+				<text name="classified_location_edit">
+					загрузка...
+				</text>
+				<button label="Установить в текущее местоположение" name="set_to_curr_location_btn"/>
+				<text name="category_label" value="Категория:"/>
+				<text name="content_type_label" value="Тип контента:"/>
+				<icons_combo_box label="Общий контент" name="content_type_edit">
+					<icons_combo_box.item label="Умеренный контент" name="mature_ci" value="Возрастной"/>
+					<icons_combo_box.item label="Общий контент" name="pg_ci" value="C разрешения родителей"/>
+				</icons_combo_box>
+				<check_box label="Автоматическое обновление каждую неделю" name="auto_renew_edit"/>
+				<text name="price_for_listing_edit_label" value="Стоимость размещения:"/>
+				<spinner label="L$" name="price_for_listing_edit" tool_tip="Цена за размещение." value="50"/>
+			</panel>
+		</panel>
+	</scroll_container>
+	<layout_stack name="edit_btns_pnl">
+		<layout_panel name="teleport_btn_lp">
+			<button label="Телепорт" name="teleport_btn"/>
+		</layout_panel>
+		<layout_panel name="map_btn_lp">
+			<button label="Карта" name="show_on_map_btn"/>
+		</layout_panel>
+		<layout_panel name="edit_btn_lp">
+			<button label="Редактировать" name="edit_btn"/>
+		</layout_panel>
+		<layout_panel name="save_btn_lp">
+			<button label="[LABEL]" name="save_changes_btn"/>
+		</layout_panel>
+		<layout_panel name="cancel_btn_lp">
+			<button label="Отменить" name="cancel_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/ru/panel_profile_classifieds.xml
new file mode 100644
index 0000000000..fac494682a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_profile_classifieds.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Объявление" name="panel_profile_classifieds">
+	<string name="no_classifieds" value="Нет рекламы"/>
+	<button label="Новый..." name="new_btn"/>
+	<button label="Удалить..." name="delete_btn"/>
+	<text name="classifieds_panel_text">
+		Загрузка...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/ru/panel_profile_firstlife.xml
new file mode 100644
index 0000000000..f5ac5e906a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_profile_firstlife.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Профиль" name="panel_profile_firstlife"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_profile_interests.xml b/indra/newview/skins/default/xui/ru/panel_profile_interests.xml
new file mode 100644
index 0000000000..ba1c3d0357
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_profile_interests.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Круг интересов" name="panel_profile_interests">
+	<text name="I Want To:">
+		Я собираюсь:
+	</text>
+	<check_box label="Построить" name="chk0"/>
+	<check_box label="Просмотреть" name="chk1"/>
+	<check_box label="Встретить" name="chk2"/>
+	<check_box label="Получить работу" name="chk6"/>
+	<check_box label="Группа" name="chk3"/>
+	<check_box label="Купить" name="chk4"/>
+	<check_box label="Продать" name="chk5"/>
+	<check_box label="Нанять" name="chk7"/>
+	<line_editor name="want_to_edit">
+		(загрузка…)
+	</line_editor>
+	<text name="Skills:">
+		Навыки:
+	</text>
+	<check_box label="Текстуры" name="schk0"/>
+	<check_box label="Архитектура" name="schk1"/>
+	<check_box label="Моделирование" name="schk3"/>
+	<check_box label="Планирование мероприятия" name="schk2"/>
+	<check_box label="Создавать сценарии" name="schk4"/>
+	<check_box label="Пользовательские символы" name="schk5"/>
+	<line_editor name="skills_edit">
+		(загрузка…)
+	</line_editor>
+	<text name="Languages:">
+		Языки:
+	</text>
+	<line_editor name="languages_edit">
+		(загрузка…)
+	</line_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_profile_notes.xml b/indra/newview/skins/default/xui/ru/panel_profile_notes.xml
new file mode 100644
index 0000000000..41117c743a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_profile_notes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Примечания и конфиденциальность" name="panel_notes">
+	<text name="status_message" value="Личные заметки об этом аватаре:"/>
+	<text name="status_message2" value="Разрешить этому аватару:"/>
+	<check_box label="Смотреть, когда я в сети" name="status_check"/>
+	<check_box label="Найти меня на карте мира" name="map_check"/>
+	<check_box label="Редактировать, удалять или брать мои объекты" name="objects_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_profile_pick.xml b/indra/newview/skins/default/xui/ru/panel_profile_pick.xml
new file mode 100644
index 0000000000..a2ff5710ea
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_profile_pick.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_pick_info">
+	<panel.string name="location_notice">
+		(будет обновлено после сохранения)
+	</panel.string>
+	<line_editor name="pick_location">
+		Загрузка...
+	</line_editor>
+	<button label="Телепорт" name="teleport_btn"/>
+	<button label="Показать на карте" name="show_on_map_btn"/>
+	<button label="Указать местоположение" name="set_to_curr_location_btn" tool_tip="Установить в текущее местоположение"/>
+	<button label="Сохранить подборку" name="save_changes_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_profile_picks.xml b/indra/newview/skins/default/xui/ru/panel_profile_picks.xml
new file mode 100644
index 0000000000..227b3f82b8
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_profile_picks.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Подборка" name="panel_picks">
+	<string name="no_picks" value="Нет подборки"/>
+	<text name="Tell everyone about your favorite places in Second Life.">
+		Сообщить всем о ваших избранных службах в Second Life.
+	</text>
+	<button label="Новый..." name="new_btn"/>
+	<button label="Удалить..." name="delete_btn"/>
+	<text name="picks_panel_text">
+		Загрузка...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/ru/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..e7a66ba29e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_profile_secondlife.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Профиль" name="panel_profile">
+	<string name="status_online">
+		В настоящее время в режиме онлайн
+	</string>
+	<string name="status_offline">
+		В настоящее время в режиме оффлайн
+	</string>
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO]
+	</string>
+	<string name="payment_update_link_url">
+		http://www.secondlife.com/account/billing.php?lang=en
+	</string>
+	<string name="partner_edit_link_url">
+		http://www.secondlife.com/account/partners.php?lang=en
+	</string>
+	<string name="my_account_link_url" value="http://secondlife.com/account"/>
+	<string name="no_partner_text" value="Никто"/>
+	<string name="no_group_text" value="Никто"/>
+	<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="Разработчик"/>
+	<string name="FSSupp" value="Поддержка"/>
+	<string name="FSQualityAssurance" value="Отладчик"/>
+	<string name="FSGW" value="Межсетевой интерфейс"/>
+	<text name="name_label" value="Имя:"/>
+	<button label="Имя:" name="set_name" tool_tip="Задать отображаемое имя"/>
+	<panel name="name_holder">
+		<text_editor name="complete_name" value="(загрузка…)"/>
+	</panel>
+	<layout_stack name="imagepositioner">
+		<layout_panel name="label_stack">
+			<text name="status" value="Статус неизвестен"/>
+			<text name="label" value="Дата рождения в Second Life:"/>
+			<text name="label2" value="Аккаунт:"/>
+			<text name="partner_label" value="Партнер:"/>
+		</layout_panel>
+	</layout_stack>
+	<text name="Groups:" value="Группы:"/>
+	<button label="+" label_selected="+" name="group_invite" tool_tip="Пригласить в группу"/>
+	<layout_stack name="aboutpositioner">
+		<layout_panel name="about_stack">
+			<text name="About:" value="О нас:"/>
+		</layout_panel>
+		<layout_panel name="give_stack">
+			<text name="Give item:" value="Передать вещь:"/>
+			<text name="Give inventory" tool_tip="Сбросить вещи из инвентаря здесь для передачи их этому игроку.">
+				Сбросить вещь из инвентаря здесь.
+			</text>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack name="buttonstack">
+		<layout_panel name="left_buttonstack">
+			<button label="Найти на карте" label_selected="Найти на карте" name="show_on_map_btn" tool_tip="Найти жителя на карте"/>
+			<button label="Оплатить" label_selected="Оплатить" name="pay" tool_tip="Выплатить деньги резиденту"/>
+		</layout_panel>
+		<layout_panel name="middle_buttonstack">
+			<button label="Предложить телепорт" label_selected="Предложить телепорт" name="teleport" tool_tip="Предложить телепорт этому жителю"/>
+			<button label="Мгновенное сообщение" label_selected="Мгновенное сообщение" name="im" tool_tip="Начать сеанс IM"/>
+		</layout_panel>
+		<layout_panel name="right_buttonstack">
+			<button label="Добавить друга" label_selected="Добавить друга" name="add_friend" tool_tip="Предложить дружбу этому жителю"/>
+			<button label="Заблокировать" name="block" tool_tip="Заблокировать этого жителя"/>
+			<button label="Разблокировать" name="unblock" tool_tip="Разблокировать этого жителя"/>
+		</layout_panel>
+	</layout_stack>
+	<check_box label="Показать в поиске" name="show_in_search_checkbox"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_profile_web.xml b/indra/newview/skins/default/xui/ru/panel_profile_web.xml
new file mode 100644
index 0000000000..18a17e2586
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_profile_web.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Веб" name="panel_profile_web">
+	<panel.string name="LoadTime" value="Время загрузки: [TIME] секунд"/>
+	<line_editor name="url_edit">
+		(загрузка…)
+	</line_editor>
+	<flyout_button label="Загрузить" name="load" tool_tip="Загрузить эту страницу с профилем с помощью встроенного веб-браузера.">
+		<flyout_button.item label="Открыть в просмотрщике браузера" name="open_item"/>
+		<flyout_button.item label="Открыть во внешнем браузере" name="home_item"/>
+	</flyout_button>
+	<button name="web_profile_popout_btn" tool_tip="Всплывающий веб-профиль"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 9192ebf601..1b2268965e 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -358,6 +358,24 @@ support@secondlife.com.
 	<string name="TestingDisconnect">
 		Тестирование отключения клиента
 	</string>
+	<string name="SocialFacebookConnecting">
+		Подключение к Facebook...
+	</string>
+	<string name="SocialFacebookPosting">
+		Публикация...
+	</string>
+	<string name="SocialFacebookDisconnecting">
+		Отключение от Facebook...
+	</string>
+	<string name="SocialFacebookErrorConnecting">
+		Проблема с подключением к Facebook
+	</string>
+	<string name="SocialFacebookErrorPosting">
+		Проблемы при публикации в Facebook
+	</string>
+	<string name="SocialFacebookErrorDisconnecting">
+		Проблема с отключением от Facebook
+	</string>
 	<string name="SocialFlickrConnecting">
 		Подключение к Flickr...
 	</string>
@@ -2508,9 +2526,21 @@ support@secondlife.com.
 	<string name="NoPicksClassifiedsText">
 		Вы не создали подборки или рекламы. Нажмите кнопку со знаком «плюс» ниже, чтобы создать подборку или рекламу
 	</string>
+	<string name="NoPicksText">
+		Вы не сделали никакой подборки. Нажмите кнопку Создать, чтобы сделать подборку.
+	</string>
+	<string name="NoClassifiedsText">
+		Вы не сделали никакой рекламы. Нажмите кнопку Создать, чтобы сделать рекламу.
+	</string>
 	<string name="NoAvatarPicksClassifiedsText">
 		У жителя нет подборки или рекламы
 	</string>
+	<string name="NoAvatarPicksText">
+		У пользователя нет подборки
+	</string>
+	<string name="NoAvatarClassifiedsText">
+		У пользователя нет объявлений
+	</string>
 	<string name="PicksClassifiedsLoadingText">
 		Загрузка...
 	</string>
@@ -4485,6 +4515,9 @@ support@secondlife.com.
 	<string name="share_alert">
 		Перетаскивайте вещи из инвентаря сюда
 	</string>
+	<string name="facebook_post_success">
+		Вы опубликовали сообщение в Facebook.
+	</string>
 	<string name="flickr_post_success">
 		Вы опубликовали сообщение в Flickr.
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/floater_about_land.xml b/indra/newview/skins/default/xui/tr/floater_about_land.xml
index 1f4decb056..eb23db9175 100644
--- a/indra/newview/skins/default/xui/tr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about_land.xml
@@ -352,7 +352,7 @@ Sadece büyük parseller aramada görünür.
 			</text>
 			<texture_picker name="snapshot_ctrl" tool_tip="Bir resim seçmek için tıklayın"/>
 			<text name="allow_label5">
-				Başka parsellerdeki avatarlar bu parseldeki avatarları görebilir ve onlarla sohbet edebilir
+				Diğer parsellerdeki avatarlar bu parseldeki avatarları görebilir ve onlarla sohbet edebilir
 			</text>
 			<check_box label="Avatarları Gör" name="SeeAvatarsCheck" tool_tip="Diğer parsellerdeki avatarların bu parseldeki avatarları görmesine ve onlarla sohbet etmesine, sizin de onları görüp, onlarla sohbet etmenize imkan tanır."/>
 			<text name="landing_point">
diff --git a/indra/newview/skins/default/xui/tr/floater_facebook.xml b/indra/newview/skins/default/xui/tr/floater_facebook.xml
index 656a4a81c9..d8cbd84ed1 100644
--- a/indra/newview/skins/default/xui/tr/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/tr/floater_facebook.xml
@@ -3,7 +3,7 @@
 	<tab_container name="tabs">
 		<panel label="DURUM" name="panel_facebook_status"/>
 		<panel label="FOTOĞRAF" name="panel_facebook_photo"/>
-		<panel label="KONUMA GİRİŞ YAPIN" name="panel_facebook_place"/>
+		<panel label="GİRİŞ YAP" name="panel_facebook_place"/>
 		<panel label="ARKADAŞLAR" name="panel_facebook_friends"/>
 	</tab_container>
 	<text name="connection_error_text">
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
index 6c04b64275..9657b6c3e0 100644
--- a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
@@ -6,7 +6,7 @@
 	<check_box label="Mimikler" name="check_gesture"/>
 	<check_box label="Yer İmleri" name="check_landmark"/>
 	<check_box label="Not Kartları" name="check_notecard"/>
-	<check_box label="Örgüler" name="check_mesh"/>
+	<check_box label="Ağlar" name="check_mesh"/>
 	<check_box label="Nesneler" name="check_object"/>
 	<check_box label="Komut Dosyaları" name="check_script"/>
 	<check_box label="Sesler" name="check_sound"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_texture.xml b/indra/newview/skins/default/xui/tr/floater_preview_texture.xml
index 79e184130a..8ba9123545 100644
--- a/indra/newview/skins/default/xui/tr/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preview_texture.xml
@@ -6,42 +6,23 @@
 	<floater.string name="Copy">
 		Envantere Kopyala
 	</floater.string>
-	<text name="desc txt">
-		Açıklama:
-	</text>
-	<text name="dimensions">
-		[WIDTH]px x [HEIGHT]px
-	</text>
-	<text name="aspect_ratio">
-		En boy oranını önizle
-	</text>
-	<combo_box name="combo_aspect_ratio" tool_tip="Sabit en boy oranında önizle">
-		<combo_item name="Unconstrained">
-			Kısıtsız
-		</combo_item>
-		<combo_item name="1:1" tool_tip="Grup işaretleri veya Real World profili">
-			1:1
-		</combo_item>
-		<combo_item name="4:3" tool_tip="[SECOND_LIFE] profili">
-			4:3
-		</combo_item>
-		<combo_item name="10:7" tool_tip="İlanlar ve arama listeleri, yer imleri">
-			10:7
-		</combo_item>
-		<combo_item name="3:2" tool_tip="Arazi hakkında">
-			3:2
-		</combo_item>
-		<combo_item name="16:10">
-			16:10
-		</combo_item>
-		<combo_item name="16:9" tool_tip="Profil seçmeleri">
-			16:9
-		</combo_item>
-		<combo_item name="2:1">
-			2:1
-		</combo_item>
-	</combo_box>
-	<button label="Tamam" name="Keep"/>
-	<button label="At" name="Discard"/>
-	<button label="Farklı Kaydet" name="save_tex_btn"/>
+	<layout_stack name="preview_stack">
+		<layout_panel name="texture_panel">
+			<text name="desc txt">
+				Açıklama:
+			</text>
+			<text name="dimensions">
+				[WIDTH]pks x [HEIGHT]pks
+			</text>
+			<text name="aspect_ratio">
+				En boy oranını önizle
+			</text>
+			<combo_box name="combo_aspect_ratio" tool_tip="Sabit en boy oranında önizle"/>
+		</layout_panel>
+		<layout_panel name="buttons_panel">
+			<button label="Tamam" name="Keep"/>
+			<button label="At" name="Discard"/>
+			<button label="Farklı Kaydet" name="save_tex_btn"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_profile.xml b/indra/newview/skins/default/xui/tr/floater_profile.xml
new file mode 100644
index 0000000000..bb158ddf66
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_profile.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarinfo" title="Profil">
+	<panel name="panel_profile_view">
+		<tab_container name="panel_profile_tabs">
+			<panel label="Second Life" name="panel_profile_secondlife"/>
+			<panel label="Web" name="panel_profile_web"/>
+			<panel label="İlgi alanları" name="panel_profile_interests"/>
+			<panel label="Favoriler" name="panel_profile_picks"/>
+			<panel label="İlan" name="panel_profile_classifieds"/>
+			<panel label="Gerçek Hayat" name="panel_profile_firstlife"/>
+			<panel label="Notlar" name="panel_profile_notes"/>
+		</tab_container>
+		<button label="Tamam" name="ok_btn" tool_tip="Değişiklikleri profile kaydet ve kapat"/>
+		<button label="İptal Et" label_selected="İptal Et" name="cancel_btn"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_snapshot.xml b/indra/newview/skins/default/xui/tr/floater_snapshot.xml
index be6c58e8cf..8496194700 100644
--- a/indra/newview/skins/default/xui/tr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/tr/floater_snapshot.xml
@@ -6,6 +6,9 @@
 	<string name="postcard_progress_str">
 		E-posta Gönderiliyor
 	</string>
+	<string name="facebook_progress_str">
+		Facebook&apos;ta yayınlanıyor
+	</string>
 	<string name="profile_progress_str">
 		Yayınlanıyor
 	</string>
@@ -15,6 +18,9 @@
 	<string name="local_progress_str">
 		Bilgisayara Kaydediliyor
 	</string>
+	<string name="facebook_succeeded_str">
+		Görüntü yüklendi
+	</string>
 	<string name="profile_succeeded_str">
 		Görüntü yüklendi
 	</string>
@@ -27,6 +33,9 @@
 	<string name="local_succeeded_str">
 		Bilgisayara Kaydedildi!
 	</string>
+	<string name="facebook_failed_str">
+		Görüntü Facebook zaman tünelinize yüklenemedi.
+	</string>
 	<string name="profile_failed_str">
 		Görüntü Profil Akışınıza yüklenemedi.
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/menu_name_field.xml b/indra/newview/skins/default/xui/tr/menu_name_field.xml
new file mode 100644
index 0000000000..b1afd737c3
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_name_field.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="CopyMenu">
+	<menu_item_call label="Görünen Adı Kopyala" name="copy_display"/>
+	<menu_item_call label="Aracı Adını Kopyala" name="copy_name"/>
+	<menu_item_call label="Aracı Kimliğini Kopyala" name="copy_id"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index 13867cf5b8..d39dd594c9 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -2659,6 +2659,9 @@ Daha küçük bir arazi parçası seçmeyi deneyin.
 	<notification name="SystemMessage">
 		[MESSAGE]
 	</notification>
+	<notification name="FacebookConnect">
+		[MESSAGE]
+	</notification>
 	<notification name="FlickrConnect">
 		[MESSAGE]
 	</notification>
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_classified.xml b/indra/newview/skins/default/xui/tr/panel_edit_classified.xml
index 7584b754f1..78c34a3ac0 100644
--- a/indra/newview/skins/default/xui/tr/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_classified.xml
@@ -46,8 +46,8 @@
 			<layout_panel name="save_changes_btn_lp">
 				<button label="[LABEL]" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="show_on_map_btn_lp">
-				<button label="İptal" name="cancel_btn"/>
+			<layout_panel name="cancel_btn_lp">
+				<button label="İptal Et" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
 	</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_facebook_friends.xml b/indra/newview/skins/default/xui/tr/panel_facebook_friends.xml
index 8184d6d7cf..edbe87d74c 100644
--- a/indra/newview/skins/default/xui/tr/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/tr/panel_facebook_friends.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_facebook_friends">
-	<string name="facebook_friends_empty" value="Şu an için aynı zamanda bir Second Life sakini olan hiçbir Facebook arkadaşınız yok. Facebook arkadaşlarınızı bugün Second Life&apos;a katılmaya davet edin!"/>
+	<string name="facebook_friends_empty" value="Şu anda aynı zamanda bir Second Life sakini olan hiçbir Facebook arkadaşınız yok. Facebook arkadaşlarınızdan bugün Second Life&apos;a katılmalarını isteyin!"/>
 	<string name="facebook_friends_no_connected" value="Şu anda Facebook&apos;a bağlı değilsiniz. Bağlanmak ve bu özelliği etkinleştirmek için lütfen Durum sekmesine gidin."/>
 	<accordion name="friends_accordion">
 		<accordion_tab name="tab_second_life_friends" title="SL arkadaşları"/>
 		<accordion_tab name="tab_suggested_friends" title="Bu kişileri SL arkadaşları olarak ekle"/>
 	</accordion>
 	<text name="facebook_friends_status">
-		Facebook&apos;a bağlanılmadı.
+		Facebook&apos;a bağlanılamadı.
 	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_facebook_photo.xml b/indra/newview/skins/default/xui/tr/panel_facebook_photo.xml
index d772aff937..e3150f258d 100644
--- a/indra/newview/skins/default/xui/tr/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/tr/panel_facebook_photo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_facebook_photo">
 	<combo_box name="resolution_combobox" tool_tip="Görüntü çözünürlüğü">
-		<combo_box.item label="Mevcut Pencere" name="CurrentWindow"/>
+		<combo_box.item label="Geçerli Pencere" name="CurrentWindow"/>
 		<combo_box.item label="640x480" name="640x480"/>
 		<combo_box.item label="800x600" name="800x600"/>
 		<combo_box.item label="1024x768" name="1024x768"/>
@@ -11,10 +11,10 @@
 		<combo_box.item label="Filtre Yok" name="NoFilter"/>
 	</combo_box>
 	<button label="Yenile" name="new_snapshot_btn" tool_tip="Yenilemek için tıklayın"/>
-	<button label="Önizleme" name="big_preview_btn" tool_tip="Önizleme ayarları arasında geçiş yapmak için tıklayın"/>
+	<button label="Önizleme" name="big_preview_btn" tool_tip="Önizlemeye geçmek için tıklayın"/>
 	<text name="caption_label">
 		Yorum (isteğe bağlı):
 	</text>
 	<button label="Yayınla" name="post_photo_btn"/>
-	<button label="İptal" name="cancel_photo_btn"/>
+	<button label="İptal Et" name="cancel_photo_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_facebook_place.xml b/indra/newview/skins/default/xui/tr/panel_facebook_place.xml
index 85b401a1a0..96c34d03d0 100644
--- a/indra/newview/skins/default/xui/tr/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/tr/panel_facebook_place.xml
@@ -5,5 +5,5 @@
 	</text>
 	<check_box initial_value="false" label="Konumun üstten görünümünü ekle" name="add_place_view_cb"/>
 	<button label="Yayınla" name="post_place_btn"/>
-	<button label="İptal" name="cancel_place_btn"/>
+	<button label="İptal Et" name="cancel_place_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_facebook_status.xml b/indra/newview/skins/default/xui/tr/panel_facebook_status.xml
index e6feff5949..f5dba088de 100644
--- a/indra/newview/skins/default/xui/tr/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/tr/panel_facebook_status.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_facebook_status">
 	<string name="facebook_connected" value="Facebook&apos;a şu kimlikle bağlandınız:"/>
-	<string name="facebook_disconnected" value="Facebook&apos;a bağlanılmadı"/>
+	<string name="facebook_disconnected" value="Facebook&apos;a bağlanılamadı"/>
 	<text name="account_caption_label">
-		Facebook&apos;a bağlanılmadı.
+		Facebook&apos;a bağlanılamadı.
 	</text>
 	<panel name="panel_buttons">
 		<button label="Bağlan..." name="connect_btn"/>
@@ -13,8 +13,8 @@
 		</text>
 	</panel>
 	<text name="status_caption_label">
-		Ne düşünüyorsunuz?
+		Aklınızdan ne geçiyor?
 	</text>
 	<button label="Yayınla" name="post_status_btn"/>
-	<button label="İptal" name="cancel_status_btn"/>
+	<button label="İptal Et" name="cancel_status_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_group_general.xml b/indra/newview/skins/default/xui/tr/panel_group_general.xml
index 0462026249..5578b36f3f 100644
--- a/indra/newview/skins/default/xui/tr/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_general.xml
@@ -45,7 +45,7 @@ Daha fazla yardım edinmek için farenizi seçeneklerin üzerine getirin.
 		<check_box label="Herkes katılabilir" name="open_enrollement" tool_tip="Bu grubun davet edilmeden yeni üyelerin katılmasına imkan tanıyıp tanımayacağını belirler."/>
 		<check_box label="Katılma ücreti" name="check_enrollment_fee" tool_tip="Bu gruba katılmak için bir kayıt ücretinin gerekip gerekmeyeceğini belirler"/>
 		<spinner label="L$" name="spin_enrollment_fee" tool_tip="Kayıt Ücreti işaretlendiğinde yeni üyeler gruba katılmak için bu ücreti ödemelidir."/>
-		<combo_box name="group_mature_check" tool_tip="Grubunuzun Orta seviyede içeriğe sahip olup olmadığını belirler">
+		<combo_box name="group_mature_check" tool_tip="Grubunuzun Orta olarak sınıflandırılmış bilgiler içerip içermeyeceğini belirler">
 			<combo_item name="select_mature">
 				- Erişkinlik seviyesini seçin -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/tr/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/tr/panel_group_list_item_short.xml
new file mode 100644
index 0000000000..0ed905ed35
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_group_list_item_short.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="group_list_item">
+	<text name="group_name" value="Bilinmiyor"/>
+	<button name="info_btn" tool_tip="Ek bilgi"/>
+	<button name="profile_btn" tool_tip="Profili görüntüle"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml
index 29ca4772fd..6c06bbb5d7 100644
--- a/indra/newview/skins/default/xui/tr/panel_people.xml
+++ b/indra/newview/skins/default/xui/tr/panel_people.xml
@@ -40,6 +40,7 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Çevrimiçi"/>
 				<accordion_tab name="tab_all" title="Tümü"/>
+				<accordion_tab name="tab_suggested_friends" title="Arkadaş olmak isteyebileceğiniz kişiler"/>
 			</accordion>
 		</panel>
 		<panel label="GRUPLAR" name="groups_panel">
diff --git a/indra/newview/skins/default/xui/tr/panel_profile_classified.xml b/indra/newview/skins/default/xui/tr/panel_profile_classified.xml
new file mode 100644
index 0000000000..805de24c11
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_profile_classified.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_profile_classified">
+	<panel.string name="type_mature">
+		Orta
+	</panel.string>
+	<panel.string name="type_pg">
+		Genel İçerik
+	</panel.string>
+	<panel.string name="l$_price">
+		L$[PRICE]
+	</panel.string>
+	<panel.string name="click_through_text_fmt">
+		[TELEPORT] ışınlanma, [MAP] harita, [PROFILE] profil
+	</panel.string>
+	<panel.string name="date_fmt">
+		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+	</panel.string>
+	<panel.string name="auto_renew_on">
+		Etkin
+	</panel.string>
+	<panel.string name="auto_renew_off">
+		Devre dışı
+	</panel.string>
+	<panel.string name="location_notice">
+		(kaydedildikten sonra güncellenir)
+	</panel.string>
+	<string name="publish_label">
+		Yayınla
+	</string>
+	<string name="save_label">
+		Kaydet
+	</string>
+	<scroll_container name="profile_scroll">
+		<panel name="info_scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="Bir görüntü seçmek için tıklayın"/>
+			<layout_stack name="info_panel">
+				<layout_panel name="main_info_panel">
+					<text_editor name="classified_name">
+						[name]
+					</text_editor>
+					<text name="classified_location_label" value="Konum:"/>
+					<text_editor name="classified_location" value="[loading...]"/>
+					<text name="content_type_label" value="İçerik Türü:"/>
+					<text_editor name="content_type" value="[content type]"/>
+					<text name="category_label" value="Kategori:"/>
+					<text_editor name="category" value="[category]"/>
+					<text name="creation_date_label" value="Oluşturma tarihi:"/>
+					<text_editor name="creation_date" tool_tip="Oluşturma tarihi" value="[date]"/>
+					<text name="price_for_listing_label" value="İlan fiyatı:"/>
+					<text_editor name="price_for_listing" tool_tip="İlan fiyatı.">
+						[PRICE]
+					</text_editor>
+				</layout_panel>
+				<layout_panel name="clickthrough_layout_panel">
+					<text name="click_through_label" value="Tıklama sayısı:"/>
+					<text_editor name="click_through_text" tool_tip="Tıklama verileri" value="[clicks]"/>
+				</layout_panel>
+				<layout_panel name="auto_renew_layout_panel">
+					<text name="auto_renew_label" value="Otomatik yenileme:"/>
+					<text name="auto_renew" value="Etkin"/>
+				</layout_panel>
+				<layout_panel name="descr_layout_panel">
+					<text name="classified_desc_label" value="Açıklama:"/>
+					<text_editor name="classified_desc" value="[description]"/>
+				</layout_panel>
+			</layout_stack>
+			<panel name="edit_panel">
+				<text name="Name:">
+					Başlık:
+				</text>
+				<text name="description_label">
+					Açıklama:
+				</text>
+				<text name="location_label">
+					Konum:
+				</text>
+				<text name="classified_location_edit">
+					yükleniyor...
+				</text>
+				<button label="Geçerli Konuma Ayarla" name="set_to_curr_location_btn"/>
+				<text name="category_label" value="Kategori:"/>
+				<text name="content_type_label" value="İçerik türü:"/>
+				<icons_combo_box label="Genel İçerik" name="content_type_edit">
+					<icons_combo_box.item label="Orta İçerik" name="mature_ci" value="Yetişkin"/>
+					<icons_combo_box.item label="Genel İçerik" name="pg_ci" value="PG"/>
+				</icons_combo_box>
+				<check_box label="Her hafta otomatik yenile" name="auto_renew_edit"/>
+				<text name="price_for_listing_edit_label" value="İlan fiyatı:"/>
+				<spinner label="L$" name="price_for_listing_edit" tool_tip="İlan fiyatı." value="50"/>
+			</panel>
+		</panel>
+	</scroll_container>
+	<layout_stack name="edit_btns_pnl">
+		<layout_panel name="teleport_btn_lp">
+			<button label="Işınlanma" name="teleport_btn"/>
+		</layout_panel>
+		<layout_panel name="map_btn_lp">
+			<button label="Harita" name="show_on_map_btn"/>
+		</layout_panel>
+		<layout_panel name="edit_btn_lp">
+			<button label="Düzenle" name="edit_btn"/>
+		</layout_panel>
+		<layout_panel name="save_btn_lp">
+			<button label="[LABEL]" name="save_changes_btn"/>
+		</layout_panel>
+		<layout_panel name="cancel_btn_lp">
+			<button label="İptal Et" name="cancel_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/tr/panel_profile_classifieds.xml
new file mode 100644
index 0000000000..0edae1ab2a
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_profile_classifieds.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="İlan" name="panel_profile_classifieds">
+	<string name="no_classifieds" value="İlan Yok"/>
+	<button label="Yeni..." name="new_btn"/>
+	<button label="Sil..." name="delete_btn"/>
+	<text name="classifieds_panel_text">
+		Yükleniyor...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/tr/panel_profile_firstlife.xml
new file mode 100644
index 0000000000..0f65090209
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_profile_firstlife.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Profil" name="panel_profile_firstlife"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_profile_interests.xml b/indra/newview/skins/default/xui/tr/panel_profile_interests.xml
new file mode 100644
index 0000000000..b068aa3dad
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_profile_interests.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="İlgi alanları" name="panel_profile_interests">
+	<text name="I Want To:">
+		Şunu Yapmak İstiyorum:
+	</text>
+	<check_box label="İnşa Et" name="chk0"/>
+	<check_box label="Keşfet" name="chk1"/>
+	<check_box label="Tanış" name="chk2"/>
+	<check_box label="İşe Gir" name="chk6"/>
+	<check_box label="Gruplandır" name="chk3"/>
+	<check_box label="Satın Al" name="chk4"/>
+	<check_box label="Sat" name="chk5"/>
+	<check_box label="İşe Al" name="chk7"/>
+	<line_editor name="want_to_edit">
+		(yükleniyor...)
+	</line_editor>
+	<text name="Skills:">
+		Beceriler:
+	</text>
+	<check_box label="Dokular" name="schk0"/>
+	<check_box label="Mimari" name="schk1"/>
+	<check_box label="Modelleme" name="schk3"/>
+	<check_box label="Etkinlik Planlama" name="schk2"/>
+	<check_box label="Kodlama" name="schk4"/>
+	<check_box label="Özel Karakterler" name="schk5"/>
+	<line_editor name="skills_edit">
+		(yükleniyor...)
+	</line_editor>
+	<text name="Languages:">
+		Diller:
+	</text>
+	<line_editor name="languages_edit">
+		(yükleniyor...)
+	</line_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_profile_notes.xml b/indra/newview/skins/default/xui/tr/panel_profile_notes.xml
new file mode 100644
index 0000000000..fff75dd685
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_profile_notes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Notlar ve Gizlilik" name="panel_notes">
+	<text name="status_message" value="Bu avatar ile ilgili özel notlar:"/>
+	<text name="status_message2" value="Bu avatar için şunlara izin ver:"/>
+	<check_box label="Çevrimiçi olduğumu görme" name="status_check"/>
+	<check_box label="Beni dünya haritasında bulma" name="map_check"/>
+	<check_box label="Nesnelerimi düzenleme, silme veya alma" name="objects_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_profile_pick.xml b/indra/newview/skins/default/xui/tr/panel_profile_pick.xml
new file mode 100644
index 0000000000..d42c1eff7f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_profile_pick.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_pick_info">
+	<panel.string name="location_notice">
+		(kaydedildikten sonra güncellenir)
+	</panel.string>
+	<line_editor name="pick_location">
+		Yükleniyor...
+	</line_editor>
+	<button label="Işınlanma" name="teleport_btn"/>
+	<button label="Haritada Göster" name="show_on_map_btn"/>
+	<button label="Konumu Ayarla" name="set_to_curr_location_btn" tool_tip="Geçerli Konuma Ayarla"/>
+	<button label="Favoriyi Kaydet" name="save_changes_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_profile_picks.xml b/indra/newview/skins/default/xui/tr/panel_profile_picks.xml
new file mode 100644
index 0000000000..7222a2fc2e
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_profile_picks.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Favoriler" name="panel_picks">
+	<string name="no_picks" value="Favori Yok"/>
+	<text name="Tell everyone about your favorite places in Second Life.">
+		Second Life&apos;ta favori yerlerinizi herkese anlatın!
+	</text>
+	<button label="Yeni..." name="new_btn"/>
+	<button label="Sil..." name="delete_btn"/>
+	<text name="picks_panel_text">
+		Yükleniyor...
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/tr/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..00e81d005e
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_profile_secondlife.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Profil" name="panel_profile">
+	<string name="status_online">
+		Şu Anda Çevrimiçi
+	</string>
+	<string name="status_offline">
+		Şu Anda Çevrimdışı
+	</string>
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO]
+	</string>
+	<string name="payment_update_link_url">
+		http://www.secondlife.com/account/billing.php?lang=en
+	</string>
+	<string name="partner_edit_link_url">
+		http://www.secondlife.com/account/partners.php?lang=en
+	</string>
+	<string name="my_account_link_url" value="http://secondlife.com/account"/>
+	<string name="no_partner_text" value="Yok"/>
+	<string name="no_group_text" value="Yok"/>
+	<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="Geliştirici"/>
+	<string name="FSSupp" value="Destek"/>
+	<string name="FSQualityAssurance" value="Böcek bilimci"/>
+	<string name="FSGW" value="Ağ geçidi"/>
+	<text name="name_label" value="Ad:"/>
+	<button label="Ad:" name="set_name" tool_tip="Görünen Adı Ayarla"/>
+	<panel name="name_holder">
+		<text_editor name="complete_name" value="(yükleniyor...)"/>
+	</panel>
+	<layout_stack name="imagepositioner">
+		<layout_panel name="label_stack">
+			<text name="status" value="Durum Bilinmiyor"/>
+			<text name="label" value="Second Life Doğum Tarihi:"/>
+			<text name="label2" value="Hesap:"/>
+			<text name="partner_label" value="Ortak:"/>
+		</layout_panel>
+	</layout_stack>
+	<text name="Groups:" value="Gruplar:"/>
+	<button label="+" label_selected="+" name="group_invite" tool_tip="Gruba Davet Et"/>
+	<layout_stack name="aboutpositioner">
+		<layout_panel name="about_stack">
+			<text name="About:" value="Hakkında:"/>
+		</layout_panel>
+		<layout_panel name="give_stack">
+			<text name="Give item:" value="Öğe ver:"/>
+			<text name="Give inventory" tool_tip="Envanter öğelerini bu kişiye vermek için buraya bırakın.">
+				Envanter öğesini buraya bırakın.
+			</text>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack name="buttonstack">
+		<layout_panel name="left_buttonstack">
+			<button label="Haritada Bul" label_selected="Haritada Bul" name="show_on_map_btn" tool_tip="Sakini haritada bul"/>
+			<button label="Öde" label_selected="Öde" name="pay" tool_tip="Sakine para öde"/>
+		</layout_panel>
+		<layout_panel name="middle_buttonstack">
+			<button label="Işınlanma Teklif Et" label_selected="Işınlanma Teklif Et" name="teleport" tool_tip="Sakine ışınlanma teklif et"/>
+			<button label="Anlık İleti" label_selected="Anlık İleti" name="im" tool_tip="Anlık ileti oturumu aç"/>
+		</layout_panel>
+		<layout_panel name="right_buttonstack">
+			<button label="Arkadaş Ekle" label_selected="Arkadaş Ekle" name="add_friend" tool_tip="Sakine arkadaşlık teklif et"/>
+			<button label="Engelle" name="block" tool_tip="Bu Sakini engelle"/>
+			<button label="Engellemeyi Kaldır" name="unblock" tool_tip="Bu Sakinin engellemesini kaldır"/>
+		</layout_panel>
+	</layout_stack>
+	<check_box label="Aramada göster" name="show_in_search_checkbox"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_profile_web.xml b/indra/newview/skins/default/xui/tr/panel_profile_web.xml
new file mode 100644
index 0000000000..265b1fee7e
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_profile_web.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Web" name="panel_profile_web">
+	<panel.string name="LoadTime" value="Yükleme Süresi: [TIME] saniye"/>
+	<line_editor name="url_edit">
+		(yükleniyor..)
+	</line_editor>
+	<flyout_button label="Yükle" name="load" tool_tip="Bu profil sayfasını tümleşik web tarayıcı ile yükleyin.">
+		<flyout_button.item label="Görüntüleyici içindeki tarayıcıda aç" name="open_item"/>
+		<flyout_button.item label="Dış tarayıcıda aç" name="home_item"/>
+	</flyout_button>
+	<button name="web_profile_popout_btn" tool_tip="Açılır web profili"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index dddf2365ab..713cf4caf9 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -358,6 +358,24 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="TestingDisconnect">
 		Görüntüleyici bağlantısının kesilmesi test ediliyor
 	</string>
+	<string name="SocialFacebookConnecting">
+		Facebook ile bağlantı kuruluyor...
+	</string>
+	<string name="SocialFacebookPosting">
+		Yayınlanıyor...
+	</string>
+	<string name="SocialFacebookDisconnecting">
+		Facebook bağlantısı kesiliyor...
+	</string>
+	<string name="SocialFacebookErrorConnecting">
+		Facebook ile bağlantı kurulurken sorun oluştu
+	</string>
+	<string name="SocialFacebookErrorPosting">
+		Facebook&apos;ta yayınlarken sorun oluştu
+	</string>
+	<string name="SocialFacebookErrorDisconnecting">
+		Facebook bağlantısı kesilirken sorun oluştu
+	</string>
 	<string name="SocialFlickrConnecting">
 		Flickr bağlantısı kuruluyor...
 	</string>
@@ -2508,9 +2526,21 @@ Bu mesaj size gelmeye devam ederse lütfen http://support.secondlife.com adresin
 	<string name="NoPicksClassifiedsText">
 		Herhangi bir Seçme veya İlan oluşturmadınız. Bir Seçme veya İlan oluşturmak için aşağıdaki Artı düğmesine tıklayın.
 	</string>
+	<string name="NoPicksText">
+		Herhangi bir Favori oluşturmadınız. Bir Favori oluşturmak için Yeni düğmesine tıklayın.
+	</string>
+	<string name="NoClassifiedsText">
+		Herhangi bir İlan oluşturmadınız. Bir İlan oluşturmak için Yeni düğmesine tıklayın.
+	</string>
 	<string name="NoAvatarPicksClassifiedsText">
 		Kullanıcının herhangi bir seçmesi veya ilanı yok
 	</string>
+	<string name="NoAvatarPicksText">
+		Kullanıcının favorisi yok
+	</string>
+	<string name="NoAvatarClassifiedsText">
+		Kullanıcının ilanı yok
+	</string>
 	<string name="PicksClassifiedsLoadingText">
 		Yükleniyor...
 	</string>
@@ -4488,6 +4518,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="share_alert">
 		Envanterinizden buraya öğeler sürükleyin
 	</string>
+	<string name="facebook_post_success">
+		Facebook&apos;ta yayınladınız.
+	</string>
 	<string name="flickr_post_success">
 		Flickr&apos;da yayınladınız.
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
index c56b1c2987..9213cc212d 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
@@ -6,42 +6,23 @@
 	<floater.string name="Copy">
 		覆製到收納區
 	</floater.string>
-	<text name="desc txt">
-		描述：
-	</text>
-	<text name="dimensions">
-		[WIDTH] 像素 X [HEIGHT] 像素
-	</text>
-	<text name="aspect_ratio">
-		預覽長寬比
-	</text>
-	<combo_box name="combo_aspect_ratio" tool_tip="以固定長寬比預覽">
-		<combo_item name="Unconstrained">
-			不受限
-		</combo_item>
-		<combo_item name="1:1" tool_tip="群組徽章或現實世界小檔案">
-			1:1
-		</combo_item>
-		<combo_item name="4:3" tool_tip="[SECOND_LIFE] 檔案">
-			4:3
-		</combo_item>
-		<combo_item name="10:7" tool_tip="個人廣告和搜索刊登廣告、地標">
-			10:7
-		</combo_item>
-		<combo_item name="3:2" tool_tip="土地資料">
-			3:2
-		</combo_item>
-		<combo_item name="16:10">
-			16:10
-		</combo_item>
-		<combo_item name="16:9" tool_tip="個人檔案精選">
-			16:9
-		</combo_item>
-		<combo_item name="2:1">
-			2:1
-		</combo_item>
-	</combo_box>
-	<button label="確定" name="Keep"/>
-	<button label="丟棄" name="Discard"/>
-	<button label="另存為" name="save_tex_btn"/>
+	<layout_stack name="preview_stack">
+		<layout_panel name="texture_panel">
+			<text name="desc txt">
+				描述：
+			</text>
+			<text name="dimensions">
+				[WIDTH]像素 x [HEIGHT]像素
+			</text>
+			<text name="aspect_ratio">
+				預覽長寬比
+			</text>
+			<combo_box name="combo_aspect_ratio" tool_tip="以固定長寬比預覽"/>
+		</layout_panel>
+		<layout_panel name="buttons_panel">
+			<button label="確定" name="Keep"/>
+			<button label="丟棄" name="Discard"/>
+			<button label="另存為" name="save_tex_btn"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_profile.xml b/indra/newview/skins/default/xui/zh/floater_profile.xml
new file mode 100644
index 0000000000..0f73f527a9
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_profile.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarinfo" title="簡覽">
+	<panel name="panel_profile_view">
+		<tab_container name="panel_profile_tabs">
+			<panel label="第二人生" name="panel_profile_secondlife"/>
+			<panel label="網頁" name="panel_profile_web"/>
+			<panel label="興趣" name="panel_profile_interests"/>
+			<panel label="精選地點" name="panel_profile_picks"/>
+			<panel label="分類廣告" name="panel_profile_classifieds"/>
+			<panel label="真實世界" name="panel_profile_firstlife"/>
+			<panel label="筆記" name="panel_profile_notes"/>
+		</tab_container>
+		<button label="確定" name="ok_btn" tool_tip="儲存變更到個人檔案後關閉"/>
+		<button label="取消" label_selected="取消" name="cancel_btn"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
index 4090248083..6e1a156762 100644
--- a/indra/newview/skins/default/xui/zh/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
@@ -6,6 +6,9 @@
 	<string name="postcard_progress_str">
 		正在發送電郵
 	</string>
+	<string name="facebook_progress_str">
+		發佈到臉書
+	</string>
 	<string name="profile_progress_str">
 		發佈
 	</string>
@@ -15,6 +18,9 @@
 	<string name="local_progress_str">
 		正在存到電腦
 	</string>
+	<string name="facebook_succeeded_str">
+		圖像已上傳
+	</string>
 	<string name="profile_succeeded_str">
 		圖像已上傳
 	</string>
@@ -27,6 +33,9 @@
 	<string name="local_succeeded_str">
 		成功存入電腦！
 	</string>
+	<string name="facebook_failed_str">
+		上傳圖像到你的臉書時間線時失敗。
+	</string>
 	<string name="profile_failed_str">
 		上傳圖像到你的檔案訊息發佈時出錯。
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/menu_name_field.xml b/indra/newview/skins/default/xui/zh/menu_name_field.xml
new file mode 100644
index 0000000000..5eaf3461cd
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_name_field.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="CopyMenu">
+	<menu_item_call label="複製顯示名稱" name="copy_display"/>
+	<menu_item_call label="複製代理名稱" name="copy_name"/>
+	<menu_item_call label="複製代理ID" name="copy_id"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index d304e95b09..557aab928d 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -2653,6 +2653,9 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="SystemMessage">
 		[MESSAGE]
 	</notification>
+	<notification name="FacebookConnect">
+		[MESSAGE]
+	</notification>
 	<notification name="FlickrConnect">
 		[MESSAGE]
 	</notification>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
index b06ece02ad..4d3248db46 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
@@ -46,7 +46,7 @@
 			<layout_panel name="save_changes_btn_lp">
 				<button label="[LABEL]" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="show_on_map_btn_lp">
+			<layout_panel name="cancel_btn_lp">
 				<button label="取消" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/zh/panel_group_list_item_short.xml
new file mode 100644
index 0000000000..fec4bb572a
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_group_list_item_short.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="group_list_item">
+	<text name="group_name" value="未知"/>
+	<button name="info_btn" tool_tip="詳情"/>
+	<button name="profile_btn" tool_tip="察看檔案"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index b0e60218cf..b95dd96026 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -40,6 +40,7 @@
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="上線"/>
 				<accordion_tab name="tab_all" title="全部"/>
+				<accordion_tab name="tab_suggested_friends" title="你可能想要加為好友的人"/>
 			</accordion>
 		</panel>
 		<panel label="群組" name="groups_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_classified.xml b/indra/newview/skins/default/xui/zh/panel_profile_classified.xml
new file mode 100644
index 0000000000..4eee4e8855
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_profile_classified.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_profile_classified">
+	<panel.string name="type_mature">
+		適度成人
+	</panel.string>
+	<panel.string name="type_pg">
+		一般普級內容
+	</panel.string>
+	<panel.string name="l$_price">
+		L$[PRICE]
+	</panel.string>
+	<panel.string name="click_through_text_fmt">
+		[TELEPORT] 瞬間傳送，[MAP] 地圖，[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">
+		已啟用
+	</panel.string>
+	<panel.string name="auto_renew_off">
+		已停用
+	</panel.string>
+	<panel.string name="location_notice">
+		（儲存後將會更新）
+	</panel.string>
+	<string name="publish_label">
+		發布
+	</string>
+	<string name="save_label">
+		儲存
+	</string>
+	<scroll_container name="profile_scroll">
+		<panel name="info_scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="點按以選擇圖像"/>
+			<layout_stack name="info_panel">
+				<layout_panel name="main_info_panel">
+					<text_editor name="classified_name">
+						[name]
+					</text_editor>
+					<text name="classified_location_label" value="位置："/>
+					<text_editor name="classified_location" value="[loading...]"/>
+					<text name="content_type_label" value="內容類型："/>
+					<text_editor name="content_type" value="[content type]"/>
+					<text name="category_label" value="分類："/>
+					<text_editor name="category" value="[category]"/>
+					<text name="creation_date_label" value="建立日期："/>
+					<text_editor name="creation_date" tool_tip="建立日期" value="[date]"/>
+					<text name="price_for_listing_label" value="刊登費："/>
+					<text_editor name="price_for_listing" tool_tip="刊登費。">
+						[PRICE]
+					</text_editor>
+				</layout_panel>
+				<layout_panel name="clickthrough_layout_panel">
+					<text name="click_through_label" value="點按狀況："/>
+					<text_editor name="click_through_text" tool_tip="點按資料" value="[clicks]"/>
+				</layout_panel>
+				<layout_panel name="auto_renew_layout_panel">
+					<text name="auto_renew_label" value="自動續訂："/>
+					<text name="auto_renew" value="已啟用"/>
+				</layout_panel>
+				<layout_panel name="descr_layout_panel">
+					<text name="classified_desc_label" value="描述："/>
+					<text_editor name="classified_desc" value="[description]"/>
+				</layout_panel>
+			</layout_stack>
+			<panel name="edit_panel">
+				<text name="Name:">
+					標題：
+				</text>
+				<text name="description_label">
+					描述：
+				</text>
+				<text name="location_label">
+					位置：
+				</text>
+				<text name="classified_location_edit">
+					載入中...
+				</text>
+				<button label="設定為目前位置" name="set_to_curr_location_btn"/>
+				<text name="category_label" value="分類："/>
+				<text name="content_type_label" value="內容類型："/>
+				<icons_combo_box label="一般普級內容" name="content_type_edit">
+					<icons_combo_box.item label="適度成人內容" name="mature_ci" value="適度成人"/>
+					<icons_combo_box.item label="一般普級內容" name="pg_ci" value="一般普級"/>
+				</icons_combo_box>
+				<check_box label="每星期自動續訂" name="auto_renew_edit"/>
+				<text name="price_for_listing_edit_label" value="刊登費："/>
+				<spinner label="L$" name="price_for_listing_edit" tool_tip="刊登費。" value="50"/>
+			</panel>
+		</panel>
+	</scroll_container>
+	<layout_stack name="edit_btns_pnl">
+		<layout_panel name="teleport_btn_lp">
+			<button label="瞬間傳送" name="teleport_btn"/>
+		</layout_panel>
+		<layout_panel name="map_btn_lp">
+			<button label="地圖" name="show_on_map_btn"/>
+		</layout_panel>
+		<layout_panel name="edit_btn_lp">
+			<button label="編輯" name="edit_btn"/>
+		</layout_panel>
+		<layout_panel name="save_btn_lp">
+			<button label="[LABEL]" name="save_changes_btn"/>
+		</layout_panel>
+		<layout_panel name="cancel_btn_lp">
+			<button label="取消" name="cancel_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/zh/panel_profile_classifieds.xml
new file mode 100644
index 0000000000..89b5cdf641
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_profile_classifieds.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="分類廣告" name="panel_profile_classifieds">
+	<string name="no_classifieds" value="禁止個人廣告"/>
+	<button label="新增…" name="new_btn"/>
+	<button label="刪除…" name="delete_btn"/>
+	<text name="classifieds_panel_text">
+		載入中…
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/zh/panel_profile_firstlife.xml
new file mode 100644
index 0000000000..9370661d7f
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_profile_firstlife.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="簡覽" name="panel_profile_firstlife"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_interests.xml b/indra/newview/skins/default/xui/zh/panel_profile_interests.xml
new file mode 100644
index 0000000000..150f3cca4f
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_profile_interests.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="興趣" name="panel_profile_interests">
+	<text name="I Want To:">
+		我想要：
+	</text>
+	<check_box label="建造" name="chk0"/>
+	<check_box label="探索" name="chk1"/>
+	<check_box label="見面" name="chk2"/>
+	<check_box label="受雇" name="chk6"/>
+	<check_box label="群組" name="chk3"/>
+	<check_box label="購買" name="chk4"/>
+	<check_box label="出售" name="chk5"/>
+	<check_box label="招人" name="chk7"/>
+	<line_editor name="want_to_edit">
+		（載入中...）
+	</line_editor>
+	<text name="Skills:">
+		技能：
+	</text>
+	<check_box label="材質" name="schk0"/>
+	<check_box label="架構" name="schk1"/>
+	<check_box label="建模" name="schk3"/>
+	<check_box label="計畫活動" name="schk2"/>
+	<check_box label="建腳本" name="schk4"/>
+	<check_box label="定製角色" name="schk5"/>
+	<line_editor name="skills_edit">
+		（載入中...）
+	</line_editor>
+	<text name="Languages:">
+		語言：
+	</text>
+	<line_editor name="languages_edit">
+		（載入中...）
+	</line_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_notes.xml b/indra/newview/skins/default/xui/zh/panel_profile_notes.xml
new file mode 100644
index 0000000000..17e1a997da
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_profile_notes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="筆記和隱私" name="panel_notes">
+	<text name="status_message" value="關於這化身的私人筆記："/>
+	<text name="status_message2" value="允許這個化身："/>
+	<check_box label="看見我何時上線" name="status_check"/>
+	<check_box label="在世界地圖上找到我" name="map_check"/>
+	<check_box label="邊輯，刪除或取下我的物件" name="objects_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_pick.xml b/indra/newview/skins/default/xui/zh/panel_profile_pick.xml
new file mode 100644
index 0000000000..5f8d6a2ba5
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_profile_pick.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_pick_info">
+	<panel.string name="location_notice">
+		（儲存後將會更新）
+	</panel.string>
+	<line_editor name="pick_location">
+		載入中…
+	</line_editor>
+	<button label="瞬間傳送" name="teleport_btn"/>
+	<button label="顯示在地圖上" name="show_on_map_btn"/>
+	<button label="設定位置" name="set_to_curr_location_btn" tool_tip="設定為目前位置"/>
+	<button label="儲存精選地點" name="save_changes_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_picks.xml b/indra/newview/skins/default/xui/zh/panel_profile_picks.xml
new file mode 100644
index 0000000000..8f189d1308
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_profile_picks.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="精選地點" name="panel_picks">
+	<string name="no_picks" value="無精選地點"/>
+	<text name="Tell everyone about your favorite places in Second Life.">
+		告訴大家你在Second Life中最愛的去處。
+	</text>
+	<button label="新增…" name="new_btn"/>
+	<button label="刪除…" name="delete_btn"/>
+	<text name="picks_panel_text">
+		載入中…
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/zh/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..da4aafce55
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_profile_secondlife.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="簡覽" name="panel_profile">
+	<string name="status_online">
+		目前在線
+	</string>
+	<string name="status_offline">
+		目前離線
+	</string>
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO]
+	</string>
+	<string name="payment_update_link_url">
+		http://www.secondlife.com/account/billing.php?lang=en
+	</string>
+	<string name="partner_edit_link_url">
+		http://www.secondlife.com/account/partners.php?lang=en
+	</string>
+	<string name="my_account_link_url" value="http://secondlife.com/account"/>
+	<string name="no_partner_text" value="無"/>
+	<string name="no_group_text" value="無"/>
+	<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="開發者"/>
+	<string name="FSSupp" value="支援"/>
+	<string name="FSQualityAssurance" value="除錯獵人"/>
+	<string name="FSGW" value="網關"/>
+	<text name="name_label" value="名稱："/>
+	<button label="名稱：" name="set_name" tool_tip="設定顯示名稱"/>
+	<panel name="name_holder">
+		<text_editor name="complete_name" value="（載入中...）"/>
+	</panel>
+	<layout_stack name="imagepositioner">
+		<layout_panel name="label_stack">
+			<text name="status" value="狀態不明"/>
+			<text name="label" value="Second Life生日："/>
+			<text name="label2" value="帳戶："/>
+			<text name="partner_label" value="伴侶："/>
+		</layout_panel>
+	</layout_stack>
+	<text name="Groups:" value="群組："/>
+	<button label="+" label_selected="+" name="group_invite" tool_tip="邀請加入群組"/>
+	<layout_stack name="aboutpositioner">
+		<layout_panel name="about_stack">
+			<text name="About:" value="關於："/>
+		</layout_panel>
+		<layout_panel name="give_stack">
+			<text name="Give item:" value="贈與物品："/>
+			<text name="Give inventory" tool_tip="把收納區物品放到這裡，送給此人。">
+				把收納區物品放到這裡。
+			</text>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack name="buttonstack">
+		<layout_panel name="left_buttonstack">
+			<button label="在地圖上查找" label_selected="在地圖上查找" name="show_on_map_btn" tool_tip="在地圖上找出這個居民"/>
+			<button label="支付" label_selected="支付" name="pay" tool_tip="付款給這個居民"/>
+		</layout_panel>
+		<layout_panel name="middle_buttonstack">
+			<button label="發出瞬間傳送邀請" label_selected="發出瞬間傳送邀請" name="teleport" tool_tip="向這個居民發出瞬間傳送邀請"/>
+			<button label="即時訊息" label_selected="即時訊息" name="im" tool_tip="開啟即時訊息會話"/>
+		</layout_panel>
+		<layout_panel name="right_buttonstack">
+			<button label="加為朋友" label_selected="加為朋友" name="add_friend" tool_tip="向這個居民發出交友邀請"/>
+			<button label="封鎖" name="block" tool_tip="封鎖這位居民"/>
+			<button label="解除封鎖" name="unblock" tool_tip="不再封鎖這位居民"/>
+		</layout_panel>
+	</layout_stack>
+	<check_box label="在搜尋結果中顯示" name="show_in_search_checkbox"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_web.xml b/indra/newview/skins/default/xui/zh/panel_profile_web.xml
new file mode 100644
index 0000000000..566651dceb
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_profile_web.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="網頁" name="panel_profile_web">
+	<panel.string name="LoadTime" value="載入時間：[TIME]秒"/>
+	<line_editor name="url_edit">
+		（載入中…）
+	</line_editor>
+	<flyout_button label="載入" name="load" tool_tip="用內嵌瀏覽器載入此個人檔案頁面。">
+		<flyout_button.item label="開啓内部瀏覽器" name="open_item"/>
+		<flyout_button.item label="開啓外部瀏覽器" name="home_item"/>
+	</flyout_button>
+	<button name="web_profile_popout_btn" tool_tip="彈出式個人檔案網頁"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index d14eac88ef..bc03dfdbc1 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -354,6 +354,24 @@ http://secondlife.com/viewer-access-faq
 	<string name="TestingDisconnect">
 		測試瀏覽器斷線
 	</string>
+	<string name="SocialFacebookConnecting">
+		連通臉書中…
+	</string>
+	<string name="SocialFacebookPosting">
+		發佈中…
+	</string>
+	<string name="SocialFacebookDisconnecting">
+		臉書連通中斷中…
+	</string>
+	<string name="SocialFacebookErrorConnecting">
+		連通臉書時出問題
+	</string>
+	<string name="SocialFacebookErrorPosting">
+		發佈到臉書時出問題
+	</string>
+	<string name="SocialFacebookErrorDisconnecting">
+		試圖中斷臉書連通時出問題
+	</string>
 	<string name="SocialFlickrConnecting">
 		連通 Flickr 中…
 	</string>
@@ -2504,9 +2522,21 @@ http://secondlife.com/support 求助解決問題。
 	<string name="NoPicksClassifiedsText">
 		你尚未建立任何精選地點或個人廣告。 點按下面的 + 按鈕建立精選地點或個人廣告。
 	</string>
+	<string name="NoPicksText">
+		你尚未建立任何精選地點。 點按「新增」按鈕建立精選地點。
+	</string>
+	<string name="NoClassifiedsText">
+		你尚未建立任何分類廣告。 點按「新增」按鈕建立分類廣告。
+	</string>
 	<string name="NoAvatarPicksClassifiedsText">
 		使用者無精選地點或個人廣告
 	</string>
+	<string name="NoAvatarPicksText">
+		使用者沒有精選地點
+	</string>
+	<string name="NoAvatarClassifiedsText">
+		使用者沒有分類廣告
+	</string>
 	<string name="PicksClassifiedsLoadingText">
 		載入中...
 	</string>
@@ -4484,6 +4514,9 @@ http://secondlife.com/support 求助解決問題。
 	<string name="share_alert">
 		將收納區物品拖曳到這裡
 	</string>
+	<string name="facebook_post_success">
+		成功發佈到臉書。
+	</string>
 	<string name="flickr_post_success">
 		成功發佈到 Flickr。
 	</string>
-- 
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')

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')

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')

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')

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')

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')

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')

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')

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')

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 b6c7eee50561b61842252ba3692362ed362e3fae Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 5 Nov 2021 20:20:46 +0200
Subject: SL-16320 Remove references to AvaLine from the viewer

---
 .../default/textures/icons/avaline_default_icon.jpg      | Bin 3951 -> 0 bytes
 indra/newview/skins/default/textures/textures.xml        |   2 --
 indra/newview/skins/default/xui/en/strings.xml           |   2 --
 3 files changed, 4 deletions(-)
 delete mode 100644 indra/newview/skins/default/textures/icons/avaline_default_icon.jpg

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg b/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg
deleted file mode 100644
index 3bb7f7183c..0000000000
Binary files a/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg and /dev/null differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 03878d9fe7..d92c7c1e12 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -67,8 +67,6 @@ with the same filename but different name
   <texture name="Audio_Off" file_name="icons/Audio_Off.png" preload="false" />
   <texture name="Audio_Press" file_name="icons/Audio_Press.png" preload="false" />
 
-  <texture name="Avaline_Icon" file_name="icons/avaline_default_icon.jpg" preload="true" />
-
   <texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="false" />
 
   <texture name="BackButton_Off" file_name="icons/back_arrow_off.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d115e09d5b..42e402c700 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -341,8 +341,6 @@ can be attached to notecards.
 	<!-- Group name: text shown for LLUUID::null -->
 	<string name="GroupNameNone">(none)</string>
 
-	<string name="AvalineCaller">Avaline Caller [ORDER]</string>
-
 	<!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
 	<string name="AssetErrorNone">No error</string>
 	<string name="AssetErrorRequestFailed">Asset request: failed</string>
-- 
cgit v1.2.3


From 493a3a31ffecf0fcdff97429f047a442d82206ba Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 5 Nov 2021 21:38:40 +0200
Subject: SL-16320 Remove obsolete AvaLine strings

---
 indra/newview/skins/default/xui/da/strings.xml | 3 ---
 indra/newview/skins/default/xui/de/strings.xml | 3 ---
 indra/newview/skins/default/xui/es/strings.xml | 3 ---
 indra/newview/skins/default/xui/fr/strings.xml | 3 ---
 indra/newview/skins/default/xui/it/strings.xml | 3 ---
 indra/newview/skins/default/xui/ja/strings.xml | 3 ---
 indra/newview/skins/default/xui/pl/strings.xml | 3 ---
 indra/newview/skins/default/xui/pt/strings.xml | 3 ---
 indra/newview/skins/default/xui/ru/strings.xml | 3 ---
 indra/newview/skins/default/xui/tr/strings.xml | 3 ---
 indra/newview/skins/default/xui/zh/strings.xml | 3 ---
 11 files changed, 33 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index ec6ba4800d..67262c0d0f 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -446,9 +446,6 @@ Prøv venligst om lidt igen.
 	<string name="GroupNameNone">
 		(ingen)
 	</string>
-	<string name="AvalineCaller">
-		Avaline opkalder [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		Ingen fejl
 	</string>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 43327c132d..797031ce38 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -677,9 +677,6 @@ nächsten Eigentümer angehängt werden.
 	<string name="GroupNameNone">
 		(keiner)
 	</string>
-	<string name="AvalineCaller">
-		Avaline-Anfrufer [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		Kein Fehler
 	</string>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index f5e7d0bf4e..fa022270e1 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -666,9 +666,6 @@ pueden adjuntarse a las notas.
 	<string name="GroupNameNone">
 		(ninguno)
 	</string>
-	<string name="AvalineCaller">
-		Avaline: [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		No hay ningún error
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index f26eac545a..cfb7da44b4 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -678,9 +678,6 @@ peuvent être joints aux notes.
 	<string name="GroupNameNone">
 		(aucun)
 	</string>
-	<string name="AvalineCaller">
-		Appelant Avaline [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		Aucune erreur
 	</string>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index f0466cea81..b040b37b8c 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -671,9 +671,6 @@ possono essere allegati ai biglietti.
 	<string name="GroupNameNone">
 		(nessuno)
 	</string>
-	<string name="AvalineCaller">
-		Chiamante Avaline [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		Nessun errore
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 52d6fb0c2b..46459aa9f2 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -677,9 +677,6 @@ support@secondlife.com にお問い合わせください。
 	<string name="GroupNameNone">
 		（なし）
 	</string>
-	<string name="AvalineCaller">
-		Avaline コール [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		エラーなし
 	</string>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 91fea234d2..334c44421e 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -599,9 +599,6 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="GroupNameNone">
 		(brak danych)
 	</string>
-	<string name="AvalineCaller">
-		Avaline [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		Brak błędu
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index ee982b5b22..ecbe495a95 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -631,9 +631,6 @@ ser anexado às anotações.
 	<string name="GroupNameNone">
 		(nenhum)
 	</string>
-	<string name="AvalineCaller">
-		Interlocutor Avaline [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		Nenhum erro
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index e9592a0476..681a763243 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -675,9 +675,6 @@ support@secondlife.com.
 	<string name="GroupNameNone">
 		(нет)
 	</string>
-	<string name="AvalineCaller">
-		[ORDER] абонента Avaline
-	</string>
 	<string name="AssetErrorNone">
 		Ошибок нет
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 56fad978f5..a5c3f99afe 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -675,9 +675,6 @@ kartlarına eklenebilir.
 	<string name="GroupNameNone">
 		(hiçbiri)
 	</string>
-	<string name="AvalineCaller">
-		Avaline Arayanı [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		Hata yok
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index e6c61a5d94..73c5bdb0e6 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -671,9 +671,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="GroupNameNone">
 		（無）
 	</string>
-	<string name="AvalineCaller">
-		Avaline 通話者 [ORDER]
-	</string>
 	<string name="AssetErrorNone">
 		無錯誤
 	</string>
-- 
cgit v1.2.3


From 2112abac1bed6155aa8e2b1dcb768db009639d74 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 17 Dec 2021 18:13:20 +0200
Subject: SL-16297 Support the parcel obscure_moap flag.

---
 .../skins/default/xui/en/floater_about_land.xml    | 24 +++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index b2d9e53039..2b873bb70a 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1892,7 +1892,29 @@ Only large parcels can be listed in search.
              left="110"
              name="parcel_enable_voice_channel_local"
              width="300" />
-        </panel>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="16"
+             layout="topleft"
+             left="10"
+             mouse_opaque="false"
+             name="media"
+             top_pad="10"
+             width="100">
+                Media:
+            </text>
+            <check_box
+             height="16"
+             label="Obscure MOAP"
+             layout="topleft"
+             left="110"
+             left_pad="0"
+             name="obscure_moap"
+             tool_tip="Media on a prim located outside the parcel should not play automatically for an agent within this parcel and vice versa."
+             width="300" />
+            </panel>
         <panel
          border="true"
          follows="all"
-- 
cgit v1.2.3


From e129986a49a9e1ee3ffef8a98a3dc83a310c95c9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 24 Jan 2022 23:36:56 +0200
Subject: SL-3007 Ability to report abuse from chat

---
 indra/newview/skins/default/xui/en/menu_avatar_icon.xml | 7 +++++++
 indra/newview/skins/default/xui/en/menu_url_agent.xml   | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
index 05ab4d35a0..9f394a4c74 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
@@ -96,6 +96,13 @@
      name="Pay">
        <on_click function="AvatarIcon.Action" parameter="pay" />
     </menu_item_call>
+    <menu_item_call
+     label="Report Abuse"
+     layout="topleft"
+     name="Report Abuse">
+       <on_click function="AvatarIcon.Action" parameter="report_abuse" />
+       <on_enable function="AvatarIcon.Enable" parameter="report_abuse" />
+    </menu_item_call>
     <menu_item_check
      label="Block Voice"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml
index e8b6116026..5ca8be2123 100644
--- a/indra/newview/skins/default/xui/en/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml
@@ -29,7 +29,14 @@
      name="remove_friend">
         <menu_item_call.on_click
          function="Url.RemoveFriend" />
-        </menu_item_call>
+    </menu_item_call>
+    <menu_item_call
+     label="Report Abuse"
+     layout="topleft"
+     name="report_abuse">
+        <menu_item_call.on_click
+         function="Url.ReportAbuse" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-- 
cgit v1.2.3


From 3e1a4ac54888a0082f0276ad62f5b2133baa2b2f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Jan 2022 23:17:44 +0200
Subject: SL-16695 Fixed report Abuse floater's screenshot encroaching onto
 tittle

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index d07e3cb31b..f60269ecba 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -19,7 +19,7 @@
      layout="topleft"
      left="60"
      name="screenshot"
-     top="15"
+     top="20"
      width="220" />
     <text
      type="string"
-- 
cgit v1.2.3


From ee238855d180cf6bf533ff44e6af29d540de5b66 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 28 Jan 2022 14:18:25 +0200
Subject: SL-16728 FIXED animations are not stopped after pressing the Alt +
 Shift + A

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 24d06722b9..073bdfc9bb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -423,7 +423,9 @@
         </menu_item_call>       
         <menu_item_call
          label="Stop animations"
-         name="Stop Animating My Avatar">
+         name="Stop Animating My Avatar"
+         allow_key_repeat="true"
+         shortcut="alt|shift|A">
           <menu_item_call.on_click
            function="Tools.StopAllAnimations" />
         </menu_item_call>
-- 
cgit v1.2.3


From bb71cbed04bdda9092abfc0418986be6e504ef5c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 1 Feb 2022 23:51:51 +0200
Subject: SL-16344 #6 Fixed 'choose media' button not working in some cases

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 90f32ae452..594ca08a38 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -498,10 +498,7 @@
 			 top_pad="4"
 			 tool_tip="Add Media"
 			 label="Choose..."
-			 width="85">
-				<button.commit_callback
-				function="BuildTool.AddMedia"/>
-			</button>
+			 width="85"/>
 			<button
 			 follows="top|left"
 			 height="18"
@@ -511,10 +508,7 @@
 			 tool_tip="Delete this media texture"
 			 top_delta="0"
 			 label="Remove"
-			 width="85">
-				<button.commit_callback
-				function="BuildTool.DeleteMedia"/>
-			</button>
+			 width="85"/>
             <button
 			 follows="left|top"
 			 height="18"
-- 
cgit v1.2.3


From cedbf23fd19cb8c155b7e18a922a6da3c317ca1a Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 17 Dec 2018 09:58:00 -0500
Subject: SL-10190: Add menu commands to force AV or exception in coroutine.

"Bad memory access" and "unhandled exception" are the two categories of error
that we expect might be different in a coroutine than in the viewer's main
fiber. Without this change, we've had no reliable way to force either of those
to occur.

This will require translation work for two new menu items.

# Conflicts:
#	indra/newview/skins/default/xui/en/menu_viewer.xml
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 073bdfc9bb..add89c4917 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2649,6 +2649,12 @@ function="World.EnvPreset"
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorBadMemoryAccess" />
             </menu_item_call>
+            <menu_item_call
+             label="Force Bad Memory Access in Coroutine"
+             name="Force Bad Memory Access in Coroutine">
+                <menu_item_call.on_click
+                 function="Advanced.ForceErrorBadMemoryAccessCoro" />
+            </menu_item_call>
             <menu_item_call
              label="Force Infinite Loop"
              name="Force Infinite Loop">
@@ -2668,10 +2674,10 @@ function="World.EnvPreset"
                  function="Advanced.ForceErrorSoftwareException" />
             </menu_item_call>
             <menu_item_call
-             label="Force a Crash in a Coroutine"
-             name="Force a Crash in a Coroutine">
+             label="Force Software Exception in Coroutine"
+             name="Force Software Exception in Coroutine">
                 <menu_item_call.on_click
-                 function="Advanced.ForceErrorCoroutineCrash" />
+                 function="Advanced.ForceErrorSoftwareExceptionCoro" />
             </menu_item_call>
             <menu_item_call
              label="Force a Crash in a Thread"
-- 
cgit v1.2.3


From 1f1d762693027a0f6ce7b913bcc8984767e947be Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 28 Feb 2022 13:18:53 +0200
Subject: SL-16939 FIXED Graphics driver version is not displayed for
 Portuguese language

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 5fded9228d..efe887f18e 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -47,7 +47,7 @@ Placa de vídeo: [GRAPHICS_CARD_VENDOR]
 Placa gráfica: [GRAPHICS_CARD]
 	</string>
 	<string name="AboutDriver">
-		Versão do driver de vídeo Windows: [GRAPHICS_CARD_VENDOR]
+		Versão do driver de vídeo Windows: [GRAPHICS_DRIVER_VERSION]
 	</string>
 	<string name="AboutOGL">
 		Versão do OpenGL: [OPENGL_VERSION]
-- 
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')

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')

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')

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')

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')

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 a629e845cfff17a9ab7e74dd3930e1fb63ab286b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 7 Apr 2022 00:54:25 +0300
Subject: SL-17171 Display Marketplace Error Messages only when trying to use
 Marketplace

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b589d8972b..a024f23885 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2330,6 +2330,14 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	</string>
 	<string name="InventoryMarketplaceError">
 An error occurred while opening Marketplace Listings.
+If you continue to receive this message, please contact Second Life support for assistance at http://support.secondlife.com
+	</string>
+	<string name="InventoryMarketplaceConnectionError">
+Marketplace Listings failed to connect.
+If you continue to receive this message, please contact Second Life support for assistance at http://support.secondlife.com
+	</string>
+	<string name="InventoryMarketplaceConnectionErrorReason">
+Marketplace Listings failed to connect. Reason: [REASON]
 If you continue to receive this message, please contact Second Life support for assistance at http://support.secondlife.com
 	</string>
 	<string name="InventoryMarketplaceListingsNoItemsTitle">Your Marketplace Listings folder is empty.</string>
-- 
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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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 4cfcbca748e825b4904e7f136fa625b1a0f79dfb Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard.stearns@gmail.com>
Date: Wed, 11 May 2022 18:17:20 -0700
Subject: SL-12238 - error message to match new limits

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index dd8a2cf5fd..b2bf2dee8f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3907,7 +3907,7 @@ Are you sure you want to return objects owned by [USER_NAME]?
 Couldn&apos;t set region textures:
 Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].
 
-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click &quot;Apply&quot; again.
+Replace texture [TEXTURE_NUM] with a 24-bit [MAX_SIZE]x[MAX_SIZE] or smaller image then click &quot;Apply&quot; again.
   <tag>fail</tag>
   </notification>
 
@@ -3918,7 +3918,7 @@ Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click
 Couldn&apos;t set region textures:
 Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
 
-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click &quot;Apply&quot; again.
+Replace texture [TEXTURE_NUM] with a 24-bit [MAX_SIZE]x[MAX_SIZE] or smaller image then click &quot;Apply&quot; again.
   </notification>
 
   <notification
-- 
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.

---
 .../textures/icons/Profile_Search_Visibility_Dark.png | Bin 0 -> 368 bytes
 .../icons/Profile_Search_Visibility_Light.png         | Bin 0 -> 366 bytes
 indra/newview/skins/default/textures/textures.xml     |   3 +++
 .../skins/default/xui/en/floater_display_name.xml     |   2 +-
 .../default/xui/en/panel_group_list_item_short.xml    |  18 ++++++++++++++++--
 5 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Light.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Dark.png b/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Dark.png
new file mode 100644
index 0000000000..09e627861c
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Light.png b/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Light.png
new file mode 100644
index 0000000000..1a5aa63727
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Light.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index bbf3484595..c02bef3a45 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -506,6 +506,9 @@ with the same filename but different name
   <texture name="Play_Over" file_name="icons/Play_Over.png" preload="false" />
   <texture name="Play_Press" file_name="icons/Play_Press.png" preload="false" />
   
+  <texture name="Profile_Search_Visibility_Dark" file_name="icons/Profile_Search_Visibility_Dark.png" preload="true"/>
+  <texture name="Profile_Search_Visibility_Light" file_name="icons/Profile_Search_Visibility_Light.png" preload="true"/>
+  
   <texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
   <texture name="ProgressBarSolid" file_name="widgets/ProgressBarSolid.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
   <texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" />
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')

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 9373f64f49ad9d0676731041466d353274ee51bd Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 17 May 2022 22:14:26 +0300
Subject: SL-3007 Small improvements for auto filling abuse reports

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index f60269ecba..343e72f057 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -11,6 +11,11 @@
      name="Screenshot">
         Screenshot
     </floater.string>
+    <floater.string
+     name="chat_report_format">
+Time: [MSG_TIME]
+Text: [MSG_DESCRIPTION]
+    </floater.string>
     <texture_picker
      allow_no_texture="true"
      default_image_name="None"
-- 
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

---
 .../textures/icons/Profile_Perm_Find_Disabled.png  | Bin 0 -> 1608 bytes
 .../textures/icons/Profile_Perm_Find_Enabled.png   | Bin 0 -> 1287 bytes
 .../icons/Profile_Perm_Objects_Disabled.png        | Bin 0 -> 1356 bytes
 .../icons/Profile_Perm_Objects_Enabled.png         | Bin 0 -> 1137 bytes
 .../icons/Profile_Perm_Online_Disabled.png         | Bin 0 -> 1312 bytes
 .../textures/icons/Profile_Perm_Online_Enabled.png | Bin 0 -> 1150 bytes
 indra/newview/skins/default/textures/textures.xml  |   6 ++++++
 .../default/xui/en/panel_profile_secondlife.xml    |  24 ++++++++++-----------
 8 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Profile_Perm_Find_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/Profile_Perm_Find_Enabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Enabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/Profile_Perm_Online_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/Profile_Perm_Online_Enabled.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Profile_Perm_Find_Disabled.png b/indra/newview/skins/default/textures/icons/Profile_Perm_Find_Disabled.png
new file mode 100644
index 0000000000..8f8caa10d8
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Perm_Find_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/Profile_Perm_Find_Enabled.png b/indra/newview/skins/default/textures/icons/Profile_Perm_Find_Enabled.png
new file mode 100644
index 0000000000..42a209dda5
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Perm_Find_Enabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Disabled.png b/indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Disabled.png
new file mode 100644
index 0000000000..644edf0ef6
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Enabled.png b/indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Enabled.png
new file mode 100644
index 0000000000..629c05ecb8
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Enabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/Profile_Perm_Online_Disabled.png b/indra/newview/skins/default/textures/icons/Profile_Perm_Online_Disabled.png
new file mode 100644
index 0000000000..ecf66c0ee1
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Perm_Online_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/Profile_Perm_Online_Enabled.png b/indra/newview/skins/default/textures/icons/Profile_Perm_Online_Enabled.png
new file mode 100644
index 0000000000..26123938fa
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Perm_Online_Enabled.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index c02bef3a45..a4e9e2eb1b 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -508,6 +508,12 @@ with the same filename but different name
   
   <texture name="Profile_Search_Visibility_Dark" file_name="icons/Profile_Search_Visibility_Dark.png" preload="true"/>
   <texture name="Profile_Search_Visibility_Light" file_name="icons/Profile_Search_Visibility_Light.png" preload="true"/>
+  <texture name="Profile_Perm_Find_Disabled" file_name="icons/Profile_Perm_Find_Disabled.png" preload="true"/>
+  <texture name="Profile_Perm_Find_Enabled" file_name="icons/Profile_Perm_Find_Enabled.png" preload="true"/>
+  <texture name="Profile_Perm_Objects_Disabled" file_name="icons/Profile_Perm_Objects_Disabled.png" preload="true"/>
+  <texture name="Profile_Perm_Objects_Enabled" file_name="icons/Profile_Perm_Objects_Enabled.png" preload="true"/>
+  <texture name="Profile_Perm_Online_Disabled" file_name="icons/Profile_Perm_Online_Disabled.png" preload="true"/>
+  <texture name="Profile_Perm_Online_Enabled" file_name="icons/Profile_Perm_Online_Enabled.png" preload="true"/>
   
   <texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
   <texture name="ProgressBarSolid" file_name="widgets/ProgressBarSolid.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
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 397f401a5058732a5947e2676815999cf004c5eb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 20 May 2022 23:19:26 +0300
Subject: SL-17436 Tools floater drops negative Z position for attachments

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 0abee2ff80..46f05fd7bb 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1481,6 +1481,7 @@ even though the user gets a free copy.
              layout="topleft"
              left_delta="0"
              max_val="4096"
+             min_val="-32"
              name="Pos Z"
              text_enabled_color="0 0.8 1 .65"
              top_pad="3"
-- 
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

---
 .../icons/Profile_Search_Visibility_Dark.png       | Bin 368 -> 0 bytes
 .../icons/Profile_Search_Visibility_Light.png      | Bin 366 -> 0 bytes
 .../icons/profile_group_visibility_eye_off.png     | Bin 0 -> 507 bytes
 .../profile_group_visibility_eye_off_pressed.png   | Bin 0 -> 639 bytes
 .../icons/profile_group_visibility_eye_on.png      | Bin 0 -> 485 bytes
 .../profile_group_visibility_eye_on_pressed.png    | Bin 0 -> 609 bytes
 indra/newview/skins/default/textures/textures.xml  |   6 +++--
 .../skins/default/xui/en/menu_gesture_gear.xml     |   2 +-
 .../default/xui/en/panel_group_list_item_short.xml |  27 +++++++++++++++------
 9 files changed, 25 insertions(+), 10 deletions(-)
 delete mode 100644 indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Dark.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Light.png
 create mode 100644 indra/newview/skins/default/textures/icons/profile_group_visibility_eye_off.png
 create mode 100644 indra/newview/skins/default/textures/icons/profile_group_visibility_eye_off_pressed.png
 create mode 100644 indra/newview/skins/default/textures/icons/profile_group_visibility_eye_on.png
 create mode 100644 indra/newview/skins/default/textures/icons/profile_group_visibility_eye_on_pressed.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Dark.png b/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Dark.png
deleted file mode 100644
index 09e627861c..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Dark.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Light.png b/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Light.png
deleted file mode 100644
index 1a5aa63727..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Light.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/profile_group_visibility_eye_off.png b/indra/newview/skins/default/textures/icons/profile_group_visibility_eye_off.png
new file mode 100644
index 0000000000..3a2ed399b2
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/profile_group_visibility_eye_off.png differ
diff --git a/indra/newview/skins/default/textures/icons/profile_group_visibility_eye_off_pressed.png b/indra/newview/skins/default/textures/icons/profile_group_visibility_eye_off_pressed.png
new file mode 100644
index 0000000000..789f59a491
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/profile_group_visibility_eye_off_pressed.png differ
diff --git a/indra/newview/skins/default/textures/icons/profile_group_visibility_eye_on.png b/indra/newview/skins/default/textures/icons/profile_group_visibility_eye_on.png
new file mode 100644
index 0000000000..4fb56c389c
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/profile_group_visibility_eye_on.png differ
diff --git a/indra/newview/skins/default/textures/icons/profile_group_visibility_eye_on_pressed.png b/indra/newview/skins/default/textures/icons/profile_group_visibility_eye_on_pressed.png
new file mode 100644
index 0000000000..ae04a256a4
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/profile_group_visibility_eye_on_pressed.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index a4e9e2eb1b..02d48bb0d6 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -506,8 +506,10 @@ with the same filename but different name
   <texture name="Play_Over" file_name="icons/Play_Over.png" preload="false" />
   <texture name="Play_Press" file_name="icons/Play_Press.png" preload="false" />
   
-  <texture name="Profile_Search_Visibility_Dark" file_name="icons/Profile_Search_Visibility_Dark.png" preload="true"/>
-  <texture name="Profile_Search_Visibility_Light" file_name="icons/Profile_Search_Visibility_Light.png" preload="true"/>
+  <texture name="Profile_Group_Visibility_Off" file_name="icons/profile_group_visibility_eye_off.png" preload="true"/>
+  <texture name="Profile_Group_Visibility_Off_Pressed" file_name="icons/profile_group_visibility_eye_off_pressed.png" preload="true"/>
+  <texture name="Profile_Group_Visibility_On" file_name="icons/profile_group_visibility_eye_on.png" preload="true"/>
+  <texture name="Profile_Group_Visibility_On_Pressed" file_name="icons/profile_group_visibility_eye_on_pressed.png" preload="true"/>
   <texture name="Profile_Perm_Find_Disabled" file_name="icons/Profile_Perm_Find_Disabled.png" preload="true"/>
   <texture name="Profile_Perm_Find_Enabled" file_name="icons/Profile_Perm_Find_Enabled.png" preload="true"/>
   <texture name="Profile_Perm_Objects_Disabled" file_name="icons/Profile_Perm_Objects_Disabled.png" preload="true"/>
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')

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

---
 .../textures/icons/Profile_Friend_Offline.png      | Bin 0 -> 208 bytes
 .../textures/icons/Profile_Friend_Online.png       | Bin 0 -> 189 bytes
 indra/newview/skins/default/textures/textures.xml  |   2 +
 .../default/xui/en/panel_profile_secondlife.xml    | 108 +++++++++++++++++++--
 4 files changed, 100 insertions(+), 10 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Profile_Friend_Offline.png
 create mode 100644 indra/newview/skins/default/textures/icons/Profile_Friend_Online.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Profile_Friend_Offline.png b/indra/newview/skins/default/textures/icons/Profile_Friend_Offline.png
new file mode 100644
index 0000000000..aeba6b70f7
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Friend_Offline.png differ
diff --git a/indra/newview/skins/default/textures/icons/Profile_Friend_Online.png b/indra/newview/skins/default/textures/icons/Profile_Friend_Online.png
new file mode 100644
index 0000000000..d668fd8dfa
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Friend_Online.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 02d48bb0d6..a21099ca9b 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -510,6 +510,8 @@ with the same filename but different name
   <texture name="Profile_Group_Visibility_Off_Pressed" file_name="icons/profile_group_visibility_eye_off_pressed.png" preload="true"/>
   <texture name="Profile_Group_Visibility_On" file_name="icons/profile_group_visibility_eye_on.png" preload="true"/>
   <texture name="Profile_Group_Visibility_On_Pressed" file_name="icons/profile_group_visibility_eye_on_pressed.png" preload="true"/>
+  <texture name="Profile_Friend_Offline" file_name="icons/Profile_Friend_Offline.png" preload="true"/>
+  <texture name="Profile_Friend_Online" file_name="icons/Profile_Friend_Online.png" preload="true"/>
   <texture name="Profile_Perm_Find_Disabled" file_name="icons/Profile_Perm_Find_Disabled.png" preload="true"/>
   <texture name="Profile_Perm_Find_Enabled" file_name="icons/Profile_Perm_Find_Enabled.png" preload="true"/>
   <texture name="Profile_Perm_Objects_Disabled" file_name="icons/Profile_Perm_Objects_Disabled.png" preload="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 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')

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 dd2fe2687ce58c6f6ebf16b2d66ae797022076f6 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 31 May 2022 02:24:14 +0300
Subject: DRTVWR-544 post-merge fix (restored SL-14961)

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1801ccd432..8c38691852 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2673,10 +2673,10 @@ function="World.EnvPreset"
                  function="Advanced.ForceErrorSoftwareException" />
             </menu_item_call>
             <menu_item_call
-             label="Force Software Exception in Coroutine"
-             name="Force Software Exception in Coroutine">
+             label="Force a Crash in a Coroutine"
+             name="Force a Crash in a Coroutine">
                 <menu_item_call.on_click
-                 function="Advanced.ForceErrorSoftwareExceptionCoro" />
+                 function="Advanced.ForceErrorCoroutineCrash" />
             </menu_item_call>
             <menu_item_call
              label="Force a Crash in a Thread"
-- 
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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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 3f6c9e2f7a8e1801fefe81f5f740501fda7dba69 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 20 Jul 2022 00:53:37 +0300
Subject: SL-17798 floater now allows 1024 textures

---
 indra/newview/skins/default/xui/da/panel_region_texture.xml | 4 ++--
 indra/newview/skins/default/xui/de/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/en/panel_region_terrain.xml | 2 +-
 indra/newview/skins/default/xui/es/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/fr/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/it/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/ja/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/pl/panel_region_terrain.xml | 2 +-
 indra/newview/skins/default/xui/pt/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/ru/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/tr/panel_region_terrain.xml | 4 ++--
 indra/newview/skins/default/xui/zh/panel_region_terrain.xml | 2 +-
 12 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml
index 45946fd222..c8a3ad328e 100644
--- a/indra/newview/skins/default/xui/da/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_texture.xml
@@ -7,8 +7,8 @@
 		ukendt
 	</text>
 	<text name="detail_texture_text">
-		Terræn teksturer (kræver 512x512, 24 bit .tga filer)
-	</text>
+    Terræn teksturer (kræver 1024x1024, 24 bit .tga filer)
+  </text>
 	<text name="height_text_lbl">
 		1 (Lav)
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_region_terrain.xml b/indra/newview/skins/default/xui/de/panel_region_terrain.xml
index 7801be30e4..42ba5b5269 100644
--- a/indra/newview/skins/default/xui/de/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_terrain.xml
@@ -10,8 +10,8 @@
 	<spinner label="Obere Terraingrenze" name="terrain_raise_spin"/>
 	<spinner label="Untere Terraingrenze" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		Terraintexturen (erfordert 24-Bit-.tga-Dateien mit einer Größe von 512x512)
-	</text>
+    Terraintexturen (erfordert 24-Bit-.tga-Dateien mit einer Größe von 1024x1024)
+  </text>
 	<text name="height_text_lbl">
 		1 (niedrig)
 	</text>
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index 8243c2715d..2aaea04a6d 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -86,7 +86,7 @@
      name="detail_texture_text"
      top="110"
      width="300">
-        Terrain Textures (requires 512x512, 24 bit .tga files)
+        Terrain Textures (requires 1024x1024, 24 bit .tga files)
     </text>
     <texture_picker
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
index cb6c03dbb5..9aba5299cb 100644
--- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
@@ -12,8 +12,8 @@ del terreno" name="terrain_raise_spin"/>
 	<spinner bottom_delta="-34" label="Límite de bajada del 
 terreno" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		Texturas del terreno (requiere archivos .tga de 512x512, 24 bits)
-	</text>
+    Texturas del terreno (requiere archivos .tga de 1024x1024, 24 bits)
+  </text>
 	<text name="height_text_lbl">
 		1 (bajo)
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
index 97f486d3a3..bbab00ca24 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
@@ -12,8 +12,8 @@ terrain" name="terrain_raise_spin"/>
 	<spinner bottom_delta="-34" label="Limite d&apos;abaissement 
 du terrain" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		Textures du terrain (fichiers .tga 512 x 512, 24 bit requis)
-	</text>
+    Textures du terrain (fichiers .tga 1024 x 1024, 24 bit requis)
+  </text>
 	<text name="height_text_lbl">
 		1 (Bas)
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
index c61ac3ecce..e08c55f63b 100644
--- a/indra/newview/skins/default/xui/it/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
@@ -12,8 +12,8 @@ terreno" name="terrain_raise_spin"/>
 	<spinner bottom_delta="-34" label="Limite di abbassamento 
 del terreno" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		Texture terreno (richiede file 512x512, 24 bit .tga)
-	</text>
+    Texture terreno (richiede file 1024x1024, 24 bit .tga)
+  </text>
 	<text name="height_text_lbl">
 		1 (basso)
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
index fb853c1925..c1080a7d7b 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
@@ -10,8 +10,8 @@
 	<spinner label="地形の上昇限度" name="terrain_raise_spin"/>
 	<spinner label="地形の下降限度" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		地形テクスチャ（512x512 の 24 bit .tga ファイル）
-	</text>
+    地形テクスチャ（1024x1024 の 24 bit .tga ファイル）
+  </text>
 	<text name="height_text_lbl">
 		1（低）
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
index f086a52dcd..2d4286334f 100644
--- a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
@@ -7,7 +7,7 @@
 	<spinner label="Górny limit terenu" name="terrain_raise_spin" />
 	<spinner label="Dolny limit terenu" name="terrain_lower_spin" />
 	<text name="detail_texture_text">
-		Tekstury terenu (512x512 / 1024x1024, 24 bitowy plik .tga)
+		Tekstury terenu (1024x1024, 24 bitowy plik .tga)
 	</text>
 	<text name="height_text_lbl">
 		1 (Nisko)
diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
index 74330a8946..1d312aeed9 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
@@ -12,8 +12,8 @@ terreno" name="terrain_raise_spin"/>
 	<spinner bottom_delta="-34" label="Limite mais baixo do 
 terreno" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		Texturas de terreno (exige arquivos .tga 512x512, 24 bit)
-	</text>
+    Texturas de terreno (exige arquivos .tga 1024x1024, 24 bit)
+  </text>
 	<text name="height_text_lbl">
 		1 (Baixo)
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
index af25565226..76b4f513a8 100644
--- a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
@@ -10,8 +10,8 @@
 	<spinner label="Верх. точка ландшафта" name="terrain_raise_spin"/>
 	<spinner label="Ниж. точка ландшафта" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		Текстуры ландшафта (требования: 512x512, 24-битные, TGA)
-	</text>
+    Текстуры ландшафта (требования: 1024x1024, 24-битные, TGA)
+  </text>
 	<text name="height_text_lbl">
 		1 (Низ)
 	</text>
diff --git a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
index 3226ee008e..e25047301d 100644
--- a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
@@ -10,8 +10,8 @@
 	<spinner label="Yüzey Yükslt. Limiti" name="terrain_raise_spin"/>
 	<spinner label="Yüzey Alçatma Limiti" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		Yüzey Dokuları (512x512, 24 bit .tga dosyalar gerektirir)
-	</text>
+    Yüzey Dokuları (1024x1024, 24 bit .tga dosyalar gerektirir)
+  </text>
 	<text name="height_text_lbl">
 		1 (Düşük)
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
index 85e759e445..81bce46876 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
@@ -10,7 +10,7 @@
 	<spinner label="地形提升限制" name="terrain_raise_spin"/>
 	<spinner label="地形降低限制" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		地形材質（須 512x512，24 位元 .tga 檔格式）
+		地形材質（須 1024x1024，24 位元 .tga 檔格式）
 	</text>
 	<text name="height_text_lbl">
 		1（低）
-- 
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')

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


From 1cc4e061bb2a59f2003d5e8ae514ae4407800222 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 6 Sep 2022 21:46:47 +0300
Subject: SL-18097 Don't permit multiple instances of 'unsaved changes' popups

Make notifications modal. When multiple ones are visible, first popup works, interacting with second one causes a crash. And it shouldn't be possible to change anything in floater when these notifications are visible
---
 indra/newview/skins/default/xui/en/notifications.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 1297366b4b..1ddec93668 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1521,7 +1521,7 @@ Delete pick &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
   <notification
    icon="alert.tga"
    name="ProfileUnpublishedClassified"
-   type="alert">
+   type="alertmodal">
     You have unpublished classifieds. They will be lost if you close the window.
     <tag>confirm</tag>
     <usetemplate
@@ -1533,7 +1533,7 @@ Delete pick &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
   <notification
    icon="alert.tga"
    name="ProfileUnsavedChanges"
-   type="alert">
+   type="alertmodal">
     You have usaved changes.
     <tag>confirm</tag>
     <tag>save</tag>
-- 
cgit v1.2.3


From 372e5b6dfad34fa0927dcf0446136aee1e338a19 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 8 Sep 2022 02:18:25 +0300
Subject: SL-3007 Report abuse option in paticipan list

---
 indra/newview/skins/default/xui/en/menu_conversation.xml    | 7 +++++++
 indra/newview/skins/default/xui/en/menu_im_conversation.xml | 7 +++++++
 2 files changed, 14 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index ed362b36e5..59e6106a28 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -132,6 +132,13 @@
         <on_click function="Avatar.DoToSelected" parameter="pay" />
         <on_enable function="Avatar.EnableItem" parameter="can_pay" />
     </menu_item_call>
+    <menu_item_call
+     label="Report Abuse"
+     layout="topleft"
+     name="report_abuse">
+       <on_click function="Avatar.DoToSelected" parameter="report_abuse" />
+       <on_enable function="Avatar.EnableItem" parameter="report_abuse" />
+    </menu_item_call>
     <menu_item_check
      label="Block Voice"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_im_conversation.xml b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
index 43287c6ec3..b38fae4404 100644
--- a/indra/newview/skins/default/xui/en/menu_im_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
@@ -79,6 +79,13 @@
     </menu_item_call>
     <menu_item_separator
      layout="topleft"/>
+    <menu_item_call
+     label="Report Abuse"
+     layout="topleft"
+     name="Report Abuse">
+       <on_click function="Avatar.GearDoToSelected" parameter="report_abuse" />
+       <on_enable function="Avatar.EnableGearItem" parameter="report_abuse" />
+    </menu_item_call>
     <menu_item_check
      label="Block Voice"
      layout="topleft"
-- 
cgit v1.2.3