SL-15312 Legacy profiles remake #4

2 files changed, 50 insertions, 9 deletions

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