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