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