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

---
 indra/newview/llpanelprofile.cpp                   |  84 +-
 indra/newview/llpanelprofile.h                     |  10 +-
 .../skins/default/xui/en/floater_profile.xml       |   8 +-
 .../default/xui/en/panel_profile_secondlife.xml    | 844 ++++++++++-----------
 4 files changed, 414 insertions(+), 532 deletions(-)

diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 17c557e4f9..8db9658837 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -260,10 +260,6 @@ void request_avatar_properties_coro(std::string cap_url, LLUUID agent_id)
     {
         panel_notes->processProperties(&avatar_notes);
     }
-    if (panel_sl)
-    {
-        panel_sl->processNotesProperties(&avatar_notes);
-    }
 }
 
 //TODO: changes take two minutes to propagate!
@@ -863,7 +859,6 @@ BOOL LLPanelProfileSecondLife::postBuild()
     mSecondLifePic          = getChild<LLIconCtrl>("2nd_life_pic");
     mSecondLifePicLayout    = getChild<LLPanel>("image_panel");
     mDescriptionEdit        = getChild<LLTextEditor>("sl_description_edit");
-    mNotesSnippet           = getChild<LLTextEditor>("notes_snippet");
     mAgentActionMenuButton  = getChild<LLMenuButton>("agent_actions_menu");
     mSaveDescriptionChanges = getChild<LLButton>("save_description_changes");
     mDiscardDescriptionChanges = getChild<LLButton>("discard_description_changes");
@@ -979,14 +974,16 @@ void LLPanelProfileSecondLife::resetData()
     mGroups.clear();
     mGroupList->setGroups(mGroups);
 
+    bool own_profile = getSelfProfile();
     mCanSeeOnlineIcon->setVisible(false);
-    mCantSeeOnlineIcon->setVisible(true);
+    mCantSeeOnlineIcon->setVisible(!own_profile);
     mCanSeeOnMapIcon->setVisible(false);
-    mCantSeeOnMapIcon->setVisible(true);
+    mCantSeeOnMapIcon->setVisible(!own_profile);
     mCanEditObjectsIcon->setVisible(false);
-    mCantEditObjectsIcon->setVisible(true);
+    mCantEditObjectsIcon->setVisible(!own_profile);
 
-    childSetVisible("permissions_panel", false);
+    childSetVisible("partner_layout", FALSE);
+    childSetVisible("partner_spacer_layout", TRUE);
 }
 
 void LLPanelProfileSecondLife::processProfileProperties(const LLAvatarData* avatar_data)
@@ -1027,11 +1024,6 @@ void LLPanelProfileSecondLife::processGroupProperties(const LLAvatarGroups* avat
     mGroupList->setGroups(mGroups);
 }
 
-void LLPanelProfileSecondLife::processNotesProperties(LLAvatarNotes* avatar_notes)
-{
-    mNotesSnippet->setValue(avatar_notes->notes);
-}
-
 void LLPanelProfileSecondLife::openGroupProfile()
 {
     LLUUID group_id = mGroupList->getSelectedUUID();
@@ -1041,15 +1033,8 @@ void LLPanelProfileSecondLife::openGroupProfile()
 void LLPanelProfileSecondLife::onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name)
 {
     mAvatarNameCacheConnection.disconnect();
-    if (getIsLoaded())
-    {
-        fillNameAgeData(av_name, mBornOn);
-    }
-}
-
-void LLPanelProfileSecondLife::setNotesSnippet(std::string &notes)
-{
-    mNotesSnippet->setValue(notes);
+    getChild<LLUICtrl>("display_name")->setValue(av_name.getDisplayName());
+    getChild<LLUICtrl>("user_name")->setValue(av_name.getAccountName());
 }
 
 void LLPanelProfileSecondLife::setProfileImageUploading(bool loading)
@@ -1128,20 +1113,7 @@ void LLPanelProfileSecondLife::fillCommonData(const LLAvatarData* avatar_data)
     // and to make sure icons in text will be up to date
     LLAvatarIconIDCache::getInstance()->add(avatar_data->avatar_id, avatar_data->image_id);
 
-    mBornOn = avatar_data->born_on;
-
-    // Should be possible to get user and display names from AgentProfile capability
-    // but at the moment contraining this to limits of LLAvatarData
-    LLAvatarName av_name;
-    if (LLAvatarNameCache::get(avatar_data->avatar_id, &av_name))
-    {
-        fillNameAgeData(av_name, mBornOn);
-    }
-    else if (!mAvatarNameCacheConnection.connected())
-    {
-        // shouldn't happen, but just in case
-        mAvatarNameCacheConnection = LLAvatarNameCache::get(getAvatarId(), boost::bind(&LLPanelProfileSecondLife::onAvatarNameCache, this, _1, _2));
-    }
+    fillAgeData(avatar_data->born_on);
 
     setDescriptionText(avatar_data->about_text);
 
@@ -1184,6 +1156,7 @@ void LLPanelProfileSecondLife::fillPartnerData(const LLAvatarData* avatar_data)
     if (avatar_data->partner_id.notNull())
     {
         childSetVisible("partner_layout", TRUE);
+        childSetVisible("partner_spacer_layout", FALSE);
         LLStringUtil::format_map_t args;
         args["[LINK]"] = LLSLURL("agent", avatar_data->partner_id, "inspect").getSLURLString();
         std::string partner_text = getString("partner_text", args);
@@ -1192,6 +1165,7 @@ void LLPanelProfileSecondLife::fillPartnerData(const LLAvatarData* avatar_data)
     else
     {
         childSetVisible("partner_layout", FALSE);
+        childSetVisible("partner_spacer_layout", TRUE);
     }
 }
 
@@ -1207,6 +1181,11 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data
 
 void LLPanelProfileSecondLife::fillRightsData()
 {
+    if (getSelfProfile())
+    {
+        return;
+    }
+
     const LLRelationship* relation = LLAvatarTracker::instance().getBuddyInfo(getAvatarId());
     // If true - we are viewing friend's profile, enable check boxes and set values.
     if (relation)
@@ -1232,20 +1211,15 @@ void LLPanelProfileSecondLife::fillRightsData()
         mCanEditObjectsIcon->setVisible(false);
         mCantEditObjectsIcon->setVisible(true);
     }
-
-    childSetVisible("permissions_panel", NULL != relation);
 }
 
-void LLPanelProfileSecondLife::fillNameAgeData(const LLAvatarName &av_name, const LLDate &born_on)
+void LLPanelProfileSecondLife::fillAgeData(const LLDate &born_on)
 {
-    getChild<LLUICtrl>("display_name")->setValue(av_name.getDisplayName());
-
-    std::string name_and_date = getString("name_date_format");
+    std::string name_and_date = getString("date_format");
     LLSD args_name;
     args_name["datetime"] = (S32)born_on.secondsSinceEpoch();
-    args_name["[NAME]"] = av_name.getAccountName();
     LLStringUtil::format(name_and_date, args_name);
-    getChild<LLUICtrl>("user_name_date")->setValue(name_and_date);
+    getChild<LLUICtrl>("sl_birth_date")->setValue(name_and_date);
 
     std::string register_date = getString("age_format");
     LLSD args_age;
@@ -1259,12 +1233,12 @@ void LLPanelProfileSecondLife::onImageLoaded(BOOL success, LLViewerFetchedTextur
     LLRect imageRect = mSecondLifePicLayout->getRect();
     if (!success || imagep->getFullWidth() == imagep->getFullHeight())
     {
-        mSecondLifePicLayout->reshape(imageRect.getHeight(), imageRect.getHeight());
+        mSecondLifePicLayout->reshape(imageRect.getWidth(), imageRect.getWidth());
     }
     else
     {
         // assume 3:4, for sake of firestorm
-        mSecondLifePicLayout->reshape(imageRect.getHeight() * 4 / 3, imageRect.getHeight());
+        mSecondLifePicLayout->reshape(imageRect.getWidth(), imageRect.getWidth() * 3 / 4);
     }
 }
 
@@ -1348,7 +1322,6 @@ void LLPanelProfileSecondLife::updateOnlineStatus()
     }
     else
     {
-        childSetVisible("spacer_layout", true);
         childSetVisible("frind_layout", false);
         childSetVisible("online_layout", false);
         childSetVisible("offline_layout", false);
@@ -1357,7 +1330,6 @@ void LLPanelProfileSecondLife::updateOnlineStatus()
 
 void LLPanelProfileSecondLife::processOnlineStatus(bool is_friend, bool show_online, bool online)
 {
-    childSetVisible("spacer_layout", false);
     childSetVisible("frind_layout", is_friend);
     childSetVisible("online_layout", online && show_online);
     childSetVisible("offline_layout", !online && show_online);
@@ -2157,20 +2129,6 @@ void LLPanelProfileNotes::onSaveNotesChanges()
     {
         LLCoros::instance().launch("putAgentUserInfoCoro",
             boost::bind(put_avatar_properties_coro, cap_url, getAvatarId(), LLSD().with("notes", mCurrentNotes)));
-        
-
-        LLFloater* parent_floater = gFloaterView->getParentFloater(this);
-        if (!parent_floater)
-        {
-            return;
-        }
-
-        LLPanel* panel = parent_floater->findChild<LLPanel>(PANEL_SECONDLIFE, TRUE);
-        LLPanelProfileSecondLife *panel_sl = dynamic_cast<LLPanelProfileSecondLife*>(panel);
-        if (panel_sl)
-        {
-            panel_sl->setNotesSnippet(mCurrentNotes);
-        }
     }
     else
     {
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index 5b30a6c536..19ce92a2d4 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -99,7 +99,6 @@ public:
 
 	void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name);
 
-    void setNotesSnippet(std::string &notes);
     void setProfileImageUploading(bool loading);
     void setProfileImageUploaded(const LLUUID &image_asset_id);
 
@@ -119,11 +118,6 @@ protected:
 	 */
 	void processGroupProperties(const LLAvatarGroups* avatar_groups);
 
-    /**
-     * Processes notes related data received from server.
-     */
-    void processNotesProperties(LLAvatarNotes* avatar_notes);
-
 	/**
 	 * Fills common for Avatar profile and My Profile fields.
 	 */
@@ -147,7 +141,7 @@ protected:
     /**
      * Fills user name, display name, age.
      */
-    void fillNameAgeData(const LLAvatarName &av_name, const LLDate &born_on);
+    void fillAgeData(const LLDate &born_on);
 
     void onImageLoaded(BOOL success, LLViewerFetchedTexture *imagep);
     static void onImageLoaded(BOOL success,
@@ -198,7 +192,6 @@ private:
     LLIconCtrl*			mSecondLifePic;
 	LLPanel*			mSecondLifePicLayout;
     LLTextEditor*		mDescriptionEdit;
-    LLTextEditor*		mNotesSnippet;
     LLMenuButton*		mAgentActionMenuButton;
     LLButton*			mSaveDescriptionChanges;
     LLButton*			mDiscardDescriptionChanges;
@@ -216,7 +209,6 @@ private:
     bool				mWaitingForImageUpload;
     bool				mAllowPublish;
     std::string			mDescriptionText;
-    LLDate				mBornOn;
 
 	boost::signals2::connection	mAvatarNameCacheConnection;
 };
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