From abf2df530f2a491f71204edd0fe39db1b70258ae Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Tue, 5 Jan 2010 15:19:13 -0800
Subject: EXT-3884 [BSI] group list cut off when there is room to display more
 - made room for more groups, but list is sent as a comma delmited string from
 server. Requires code change to list one per line.

---
 .../skins/default/xui/en/panel_my_profile.xml      | 146 ++++++---------------
 1 file changed, 39 insertions(+), 107 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 10381d3987..d8726a07e2 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -34,7 +34,7 @@
     <scroll_container
      color="DkGray2"
      follows="all"
-     height="485"
+     height="500"
      layout="topleft"
      name="profile_scroll"
      reserve_scroll_corner="false"
@@ -44,7 +44,7 @@
       <panel
          name="scroll_content_panel"
          follows="left|top|right"
-          height="485"
+          height="500"
          layout="topleft"
          top="0"
          left="0"
@@ -56,7 +56,7 @@
          left="10"
          name="second_life_image_panel"
          top="0"
-         width="280">
+         width="300">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
@@ -88,7 +88,7 @@
              text_color="white"
              top_delta="0"
              value="[SECOND_LIFE]:"
-             width="165" />
+             width="180" />
             <expandable_text
              follows="left|top|right"
              height="95"
@@ -97,7 +97,7 @@
              textbox.max_length="512"
              name="sl_description_edit"
              top_pad="-3"
-             width="173"
+             width="188"
              expanded_bg_visible="true"
              expanded_bg_color="DkGray">
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
@@ -110,7 +110,7 @@
 	     top_pad="10"
          left="10"
          name="first_life_image_panel"
-         width="280">
+         width="300">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
@@ -141,7 +141,7 @@
              text_color="white"
              top_delta="0"
              value="Real World:"
-             width="165" />
+             width="180" />
             <expandable_text
              follows="left|top|right"
              height="95"
@@ -150,90 +150,23 @@
              textbox.max_length="512"
              name="fl_description_edit"
              top_pad="-3"
-             width="173"
+             width="188"
              expanded_bg_visible="true"
              expanded_bg_color="DkGray">
                 Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
             </expandable_text>
         </panel>
-
-
-	<!-- <panel
-       name="lifes_images_panel"
-         follows="left|top|right"
-         height="244"
-         layout="topleft"
-         top="0"
-         left="0"
-         width="285">
-	 <panel
-         follows="left|top"
-         height="117"
-         layout="topleft"
-         left="10"
-         name="second_life_image_panel"
-         top="0"
-         width="285">
-          <text
-             follows="left|top|right"
-	     font.style="BOLD"
-             height="15"
-             layout="topleft"
-             left="0"
-            name="second_life_photo_title_text"
-             text_color="white"
-             value="[SECOND_LIFE]:"
-             width="170" />
-            <texture_picker
-             allow_no_texture="true"
-             default_image_name="None"
-             enabled="false"
-             follows="top|left"
-             height="117"
-             layout="topleft"
-             left="0"
-             name="2nd_life_pic"
-             top_pad="0"
-             width="102" />
-          </panel>
-           <icon
-           height="18"
-           image_name="AddItem_Off"
-           layout="topleft"
-           name="2nd_life_edit_icon"
-           label=""
-           left="87"
-           tool_tip="Click to select an image"
-           top="25"
-           width="18" />
-      </panel> -->
-
-
-
-
-        <text
-         type="string"
-         follows="left|top"
-         font="SansSerifSmall"
-	     font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="me_homepage_text"
-         text_color="white"
-         top_pad="0"
-         width="280">
-             Homepage:
-        </text>
         <text
          follows="left|top"
          height="15"
+	 font.style="BOLD"
+	 font="SansSerifMedium"
          layout="topleft"
          left="10"
          name="homepage_edit"
          top_pad="0"
          value="http://librarianavengers.org"
-         width="280"
+         width="300"
          word_wrap="false"
          use_ellipses="true"
          />
@@ -246,8 +179,8 @@
          name="title_member_text"
          text_color="white"
          top_pad="10"
-         value="Member Since:"
-         width="280" />
+         value="Resident Since:"
+         width="300" />
         <text
          follows="left|top"
          height="15"
@@ -255,7 +188,7 @@
          left="10"
          name="register_date"
          value="05/31/2376"
-         width="280"
+         width="300"
          word_wrap="true" />
         <text
          follows="left|top"
@@ -265,9 +198,9 @@
          left="10"
          name="title_acc_status_text"
          text_color="white"
-         top_pad="10"
+         top_pad="5"
          value="Account Status:"
-         width="280" />
+         width="300" />
        <!-- <text
          type="string"
          follows="left|top"
@@ -287,7 +220,7 @@
          name="acc_status_text"
          top_pad="0"
          value="Resident. No payment info on file."
-         width="280"
+         width="300"
          word_wrap="true" />
         <text
          follows="left|top"
@@ -297,9 +230,9 @@
          left="10"
          name="title_partner_text"
          text_color="white"
-         top_pad="5"
+         top_pad="3"
          value="Partner:"
-         width="280" />
+         width="300" />
         <panel
          follows="left|top"
          height="15"
@@ -307,7 +240,7 @@
          left="10"
          name="partner_data_panel"
          top_pad="0"
-         width="280">
+         width="300">
             <text
              follows="left|top"
              height="10"
@@ -316,31 +249,31 @@
              name="partner_text"
              top="0"
              value="[FIRST] [LAST]"
-         width="280"
+         width="300"
              word_wrap="true" />
          </panel>
         <text
          follows="left|top"
 	 font.style="BOLD"
-         height="15"
+         height="13"
          layout="topleft"
          left="10"
          name="title_groups_text"
          text_color="white"
-         top_pad="8"
+         top_pad="3"
          value="Groups:"
-         width="280" />
-                     <expandable_text
+         width="300" />
+         <expandable_text
          follows="left|top|bottom"
-         height="60"
+         height="115"
          layout="topleft"
-         left="10"
-             name="sl_groups"
+         left="7"
+         name="sl_groups"
        top_pad="0"
-         width="280"
-             expanded_bg_visible="true"
-             expanded_bg_color="DkGray">
-            Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+         width="300"
+         expanded_bg_visible="true"
+         expanded_bg_color="DkGray">
+            Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
         </expandable_text>
       </panel>
  </scroll_container>
@@ -350,7 +283,6 @@
      left="0"
      name="profile_buttons_panel"
      top_pad="2"
-     bottom="10"
      height="23"
      width="303">
         <button
@@ -362,7 +294,7 @@
          mouse_opaque="false"
          name="add_friend"
          top="5"
-         width="75" />
+         width="80" />
         <button
          follows="bottom|left"
          height="23"
@@ -370,7 +302,7 @@
          layout="topleft"
          name="im"
          top="5"
-         left_pad="5"
+         left_pad="3"
          width="45" />
         <button
          follows="bottom|left"
@@ -378,7 +310,7 @@
          label="Call"
          layout="topleft"
          name="call"
-         left_pad="5"
+         left_pad="3"
          top="5"
          width="45" />
         <button
@@ -389,7 +321,7 @@
          layout="topleft"
          name="show_on_map_btn"
          top="5"
-         left_pad="5"
+         left_pad="3"
          width="45" />
         <button
          follows="bottom|left"
@@ -397,15 +329,15 @@
          label="Teleport"
          layout="topleft"
          name="teleport"
-         left_pad="5"
+         left_pad="3"
          top="5"
-         width="80" />
+         width="85" />
  </panel>
  <panel
      follows="bottom|left"
      layout="topleft"
      left="0"
-     top_pad="-17"
+     top_pad="-2"
      name="profile_me_buttons_panel"
      visible="false"
      height="23"
-- 
cgit v1.2.3


From 3fa03a6ccabd6c16c9023a55f98177614e06f2d8 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Tue, 5 Jan 2010 15:41:13 -0800
Subject: EXT-3884 [BSI] group list cut off when there is room to display more
 - made room for more groups, but list is sent as a comma delmited string from
 server. Requires code change to list one per line.

---
 .../skins/default/xui/en/panel_my_profile.xml      |  23 ++--
 .../newview/skins/default/xui/en/panel_profile.xml | 128 ++++++++++-----------
 2 files changed, 70 insertions(+), 81 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index d8726a07e2..ffc568281e 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -43,14 +43,14 @@
      width="313">
       <panel
          name="scroll_content_panel"
-         follows="left|top|right"
+         follows="all"
           height="500"
          layout="topleft"
          top="0"
          left="0"
-         width="297">
-	  <panel
-         follows="left|top"
+         width="313">
+	 <panel
+         follows="left|top|right"
          height="117"
          layout="topleft"
          left="10"
@@ -80,7 +80,7 @@
            width="102" />
             <text
              follows="left|top|right"
-	         font.style="BOLD"
+	     font.style="BOLD"
              height="15"
              layout="topleft"
              left_pad="10"
@@ -104,10 +104,10 @@
             </expandable_text>
         </panel>
         <panel
-         follows="left|top"
+         follows="left|top|right"
          height="117"
          layout="topleft"
-	     top_pad="10"
+	 top_pad="10"
          left="10"
          name="first_life_image_panel"
          width="300">
@@ -133,7 +133,7 @@
            width="102" />
             <text
              follows="left|top|right"
-	         font.style="BOLD"
+	     font.style="BOLD"
              height="15"
              layout="topleft"
              left_pad="10"
@@ -264,7 +264,7 @@
          value="Groups:"
          width="300" />
          <expandable_text
-         follows="left|top|bottom"
+         follows="all"
          height="115"
          layout="topleft"
          left="7"
@@ -285,7 +285,7 @@
      top_pad="2"
      height="23"
      width="303">
-        <button
+         <button
          follows="bottom|left"
          height="23"
          label="Add Friend"
@@ -293,6 +293,7 @@
          left="0"
          mouse_opaque="false"
          name="add_friend"
+         tool_tip="Offer friendship to the resident"
          top="5"
          width="80" />
         <button
@@ -337,7 +338,7 @@
      follows="bottom|left"
      layout="topleft"
      left="0"
-     top_pad="-2"
+     top_pad="-22"
      name="profile_me_buttons_panel"
      visible="false"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 342cf4144f..bf592535f5 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -27,42 +27,42 @@
     <string
      name="no_partner_text"
      value="None" />
-    <string 
+    <string
 	 name="RegisterDateFormat">
 	 [REG_DATE] ([AGE])
 	</string>
   <scroll_container
      color="DkGray2"
      follows="all"
-     height="485"
+     height="500"
      layout="topleft"
      name="profile_scroll"
-     reserve_scroll_corner="true"
+     reserve_scroll_corner="false"
      opaque="true"
      top="0"
      width="313">
       <panel
          name="scroll_content_panel"
-         follows="left|top|right"
-          height="485"
+         follows="all"
+          height="500"
          layout="topleft"
          top="0"
          left="0"
          width="313">
 	 <panel
-         follows="left|top"
+         follows="left|top|right"
          height="117"
          layout="topleft"
          left="10"
          name="second_life_image_panel"
          top="0"
-         width="280">
+         width="300">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
              enabled="false"
              follows="top|left"
-             height="102"
+             height="117"
              layout="topleft"
              left="0"
              name="2nd_life_pic"
@@ -78,7 +78,7 @@
              text_color="white"
              top_delta="0"
              value="[SECOND_LIFE]:"
-             width="165" />
+             width="180" />
             <expandable_text
              follows="left|top|right"
              height="95"
@@ -87,26 +87,26 @@
              textbox.max_length="512"
              name="sl_description_edit"
              top_pad="-3"
-             width="173"
+             width="188"
              expanded_bg_visible="true"
              expanded_bg_color="DkGray">
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
             </expandable_text>
         </panel>
         <panel
-         follows="left|top"
+         follows="left|top|right"
          height="117"
          layout="topleft"
 	 top_pad="10"
          left="10"
          name="first_life_image_panel"
-         width="280">
+         width="300">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
              enabled="false"
              follows="top|left"
-             height="102"
+             height="117"
              layout="topleft"
              left="0"
              name="real_world_pic"
@@ -121,7 +121,7 @@
              text_color="white"
              top_delta="0"
              value="Real World:"
-             width="165" />
+             width="180" />
             <expandable_text
              follows="left|top|right"
              height="95"
@@ -130,57 +130,45 @@
              textbox.max_length="512"
              name="fl_description_edit"
              top_pad="-3"
-             width="173"
+             width="188"
              expanded_bg_visible="true"
              expanded_bg_color="DkGray">
                 Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
             </expandable_text>
         </panel>
-        <text
-         type="string"
-         follows="left|top"
-         font="SansSerifSmall"
-	 font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="me_homepage_text"
-         text_color="white"
-         top_pad="0"
-         width="280">
-             Homepage:
-        </text>
-        <text
+       <text
          follows="left|top"
          height="15"
+	 font.style="BOLD"
+	 font="SansSerifMedium"
          layout="topleft"
          left="10"
          name="homepage_edit"
          top_pad="0"
          value="http://librarianavengers.org"
-         width="280"
+         width="300"
          word_wrap="false"
          use_ellipses="true"
          />
         <text
          follows="left|top"
-	 font.style="BOLD"
+	     font.style="BOLD"
          height="10"
          layout="topleft"
          left="10"
          name="title_member_text"
          text_color="white"
          top_pad="10"
-         value="Member Since:"
-         width="280" />
+         value="Resident Since:"
+         width="300" />
         <text
          follows="left|top"
          height="15"
          layout="topleft"
          left="10"
          name="register_date"
-         value="05/31/1976"
-         width="280"
+         value="05/31/2376"
+         width="300"
          word_wrap="true" />
         <text
          follows="left|top"
@@ -190,9 +178,9 @@
          left="10"
          name="title_acc_status_text"
          text_color="white"
-         top_pad="10"
+         top_pad="5"
          value="Account Status:"
-         width="280" />
+         width="300" />
        <!-- <text
          type="string"
          follows="left|top"
@@ -212,7 +200,7 @@
          name="acc_status_text"
          top_pad="0"
          value="Resident. No payment info on file."
-         width="280"
+         width="300"
          word_wrap="true" />
         <text
          follows="left|top"
@@ -222,9 +210,9 @@
          left="10"
          name="title_partner_text"
          text_color="white"
-         top_pad="5"
+         top_pad="3"
          value="Partner:"
-         width="280" />
+         width="300" />
         <panel
          follows="left|top"
          height="15"
@@ -232,7 +220,7 @@
          left="10"
          name="partner_data_panel"
          top_pad="0"
-         width="280">
+         width="300">
             <text
              follows="left|top"
              height="10"
@@ -241,31 +229,31 @@
              name="partner_text"
              top="0"
              value="[FIRST] [LAST]"
-         width="280"
+         width="300"
              word_wrap="true" />
          </panel>
         <text
          follows="left|top"
 	 font.style="BOLD"
-         height="15"
+         height="13"
          layout="topleft"
          left="10"
          name="title_groups_text"
          text_color="white"
-         top_pad="8"
+         top_pad="3"
          value="Groups:"
-         width="280" />
-                     <expandable_text
-         follows="left|top|bottom"
-         height="60"
+         width="300" />
+         <expandable_text
+         follows="all"
+         height="115"
          layout="topleft"
-         left="10"
-             name="sl_groups"
+         left="7"
+         name="sl_groups"
        top_pad="0"
-         width="280"
-             expanded_bg_visible="true"
-             expanded_bg_color="DkGray">
-            Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+         width="300"
+         expanded_bg_visible="true"
+         expanded_bg_color="DkGray">
+            Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
         </expandable_text>
       </panel>
  </scroll_container>
@@ -275,8 +263,7 @@
      left="0"
      name="profile_buttons_panel"
      top_pad="2"
-     bottom="0"
-     height="19"
+     height="23"
      width="303">
         <button
          follows="bottom|left"
@@ -288,7 +275,7 @@
          name="add_friend"
          tool_tip="Offer friendship to the resident"
          top="5"
-         width="77" />
+         width="80" />
         <button
          follows="bottom|left"
          height="23"
@@ -297,8 +284,8 @@
          name="im"
          tool_tip="Open instant message session"
          top="5"
-         left_pad="5"
-         width="33" />
+         left_pad="3"
+         width="45" />
         <button
          follows="bottom|left"
          height="23"
@@ -306,9 +293,9 @@
          layout="topleft"
          name="call"
          tool_tip="Call this resident"
-         left_pad="5"
+         left_pad="3"
          top="5"
-         width="40" />
+         width="45" />
         <button
          enabled="false"
          follows="bottom|left"
@@ -318,8 +305,8 @@
          name="show_on_map_btn"
          tool_tip="Show the resident on the map"
          top="5"
-         left_pad="5"
-         width="44" />
+         left_pad="3"
+         width="45" />
         <button
          follows="bottom|left"
          height="23"
@@ -327,10 +314,10 @@
          layout="topleft"
          name="teleport"
          tool_tip="Offer teleport"
-         left_pad="5"
+         left_pad="3"
          top="5"
-         width="67" />
-        <button
+         width="85" />
+       <!-- <button
          follows="bottom|right"
          height="23"
          label="▼"
@@ -339,16 +326,17 @@
          tool_tip="Pay money to or share inventory with the resident"
          right="-1"
          top="5"
-         width="21" />
+	 left_pad="3"
+         width="23" />-->
  </panel>
  <panel
      follows="bottom|left"
      layout="topleft"
      left="0"
-     top_pad="-17"
+     top_pad="-22"
      name="profile_me_buttons_panel"
      visible="false"
-     height="19"
+     height="23"
      width="303">
         <button
          follows="bottom|right"
-- 
cgit v1.2.3


From d2aabf2b1fb80b9bf6b950b9b3b2298f29098a90 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Tue, 5 Jan 2010 19:14:09 -0800
Subject: layout standarization for profiles

---
 indra/newview/skins/default/xui/en/panel_me.xml    |   2 +-
 .../skins/default/xui/en/panel_my_profile.xml      |  72 +++++++++------
 indra/newview/skins/default/xui/en/panel_notes.xml |  20 ++---
 .../newview/skins/default/xui/en/panel_profile.xml | 100 ++++++++++++---------
 .../skins/default/xui/en/panel_profile_view.xml    |   6 +-
 5 files changed, 120 insertions(+), 80 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml
index a99777848b..e779e37419 100644
--- a/indra/newview/skins/default/xui/en/panel_me.xml
+++ b/indra/newview/skins/default/xui/en/panel_me.xml
@@ -26,7 +26,7 @@
    </text> -->
     <tab_container
      follows="all"
-     height="575"
+     height="570"
      halign="center"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index ffc568281e..12a0a9155d 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -31,24 +31,41 @@
 	 name="RegisterDateFormat">
 	 [REG_DATE] ([AGE])
 	</string>
-    <scroll_container
-     color="DkGray2"
+    <layout_stack
+     name="layout"
+     orientation="vertical"
      follows="all"
-     height="500"
      layout="topleft"
-     name="profile_scroll"
-     reserve_scroll_corner="false"
-     opaque="true"
+     left="0"
      top="0"
-     width="313">
+     height="535"
+     width="313"
+     border_size="0">
       <panel
-         name="scroll_content_panel"
+         name="profile_stack"
          follows="all"
-          height="500"
          layout="topleft"
          top="0"
          left="0"
+         height="505"
          width="313">
+            <scroll_container
+             color="DkGray2"
+             follows="all"
+             layout="topleft"
+             left="0"
+             name="profile_scroll"
+             opaque="true"
+             height="505"
+             width="313"
+             top="0">
+	       <panel
+               layout="topleft"
+	       follows="left|top|right"
+              name="scroll_content_panel"
+               top="0"
+               left="0"
+               width="303">
 	 <panel
          follows="left|top|right"
          height="117"
@@ -212,16 +229,18 @@
          top_delta="0"
 	 value="Go to Dashboard"
          width="100"/> -->
-        <text
+         <text
          follows="left|top"
-         height="20"
+         height="28"
          layout="topleft"
          left="10"
          name="acc_status_text"
          top_pad="0"
-         value="Resident. No payment info on file."
          width="300"
-         word_wrap="true" />
+         word_wrap="true">
+	 Resident. No payment info on file.
+Linden.
+	 </text>
         <text
          follows="left|top"
 	 font.style="BOLD"
@@ -265,26 +284,26 @@
          width="300" />
          <expandable_text
          follows="all"
-         height="115"
+         height="113"
          layout="topleft"
          left="7"
          name="sl_groups"
        top_pad="0"
-         width="300"
+         width="298"
          expanded_bg_visible="true"
          expanded_bg_color="DkGray">
             Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
         </expandable_text>
-      </panel>
+    </panel>
  </scroll_container>
- <panel
+      </panel>
+<!-- <panel
      follows="bottom|left"
      layout="topleft"
      left="0"
      name="profile_buttons_panel"
-     top_pad="2"
-     height="23"
-     width="303">
+     height="28"
+     width="313">
          <button
          follows="bottom|left"
          height="23"
@@ -333,20 +352,21 @@
          left_pad="3"
          top="5"
          width="85" />
- </panel>
+ </panel>-->
  <panel
      follows="bottom|left"
      layout="topleft"
      left="0"
-     top_pad="-22"
+     top_pad="0"
      name="profile_me_buttons_panel"
      visible="false"
-     height="23"
-     width="303">
+     height="28"
+     width="313">
         <button
          follows="bottom|right"
          height="23"
-         left="10"
+         left="20"
+	 top="0"
          label="Edit Profile"
          name="edit_profile_btn"
          tool_tip="Edit your personal information"
@@ -358,7 +378,7 @@
          left_pad="10"
          name="edit_appearance_btn"
          tool_tip="Create/edit your appearance: physical data, clothes and etc."
-         right="-10"
          width="130" />
  </panel>
+</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index f15e75dee9..9335db0623 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -115,14 +115,14 @@
        <button
          follows="bottom|left"
          height="23"
-         label="Add"
+         label="Add Friend"
          layout="topleft"
          left="0"
          mouse_opaque="false"
          name="add_friend"
          tool_tip="Offer friendship to the resident"
          top="5"
-         width="55" />
+         width="80" />
         <button
          follows="bottom|left"
          height="23"
@@ -131,8 +131,8 @@
          name="im"
          tool_tip="Open instant message session"
          top="5"
-         left_pad="5"
-         width="40" />
+         left_pad="3"
+         width="45" />
         <button
          follows="bottom|left"
          height="23"
@@ -140,9 +140,9 @@
          layout="topleft"
          name="call"
          tool_tip="Call this resident"
-         left_pad="5"
+         left_pad="3"
          top="5"
-         width="55" />
+         width="45" />
         <button
          enabled="false"
          follows="bottom|left"
@@ -152,8 +152,8 @@
          name="show_on_map_btn"
          tool_tip="Show the resident on the map"
          top="5"
-         left_pad="5"
-         width="50" />
+         left_pad="3"
+         width="45" />
         <button
          follows="bottom|left"
          height="23"
@@ -161,9 +161,9 @@
          layout="topleft"
          name="teleport"
          tool_tip="Offer teleport"
-         left_pad="5"
+         left_pad="3"
          top="5"
-         width="90" />
+         width="80" />
         </panel>
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index bf592535f5..5ccc964c9a 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -31,24 +31,41 @@
 	 name="RegisterDateFormat">
 	 [REG_DATE] ([AGE])
 	</string>
-  <scroll_container
-     color="DkGray2"
+    <layout_stack
+     name="layout"
+     orientation="vertical"
      follows="all"
-     height="500"
      layout="topleft"
-     name="profile_scroll"
-     reserve_scroll_corner="false"
-     opaque="true"
+     left="0"
      top="0"
-     width="313">
+     height="535"
+     width="313"
+     border_size="0">
       <panel
-         name="scroll_content_panel"
+         name="profile_stack"
          follows="all"
-          height="500"
          layout="topleft"
          top="0"
          left="0"
+         height="505"
          width="313">
+            <scroll_container
+             color="DkGray2"
+             follows="all"
+             layout="topleft"
+             left="0"
+             name="profile_scroll"
+             opaque="true"
+             height="505"
+             width="313"
+             top="0">
+	       <panel
+               layout="topleft"
+	       follows="left|top|right"
+               name="profile_scroll_panel"
+               top="0"
+               left="0"
+               width="303">
 	 <panel
          follows="left|top|right"
          height="117"
@@ -56,7 +73,7 @@
          left="10"
          name="second_life_image_panel"
          top="0"
-         width="300">
+         width="303">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
@@ -87,7 +104,7 @@
              textbox.max_length="512"
              name="sl_description_edit"
              top_pad="-3"
-             width="188"
+             width="185"
              expanded_bg_visible="true"
              expanded_bg_color="DkGray">
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
@@ -100,7 +117,7 @@
 	 top_pad="10"
          left="10"
          name="first_life_image_panel"
-         width="300">
+         width="303">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
@@ -130,7 +147,7 @@
              textbox.max_length="512"
              name="fl_description_edit"
              top_pad="-3"
-             width="188"
+             width="185"
              expanded_bg_visible="true"
              expanded_bg_color="DkGray">
                 Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
@@ -194,14 +211,16 @@
          width="100"/> -->
         <text
          follows="left|top"
-         height="20"
+         height="28"
          layout="topleft"
          left="10"
          name="acc_status_text"
          top_pad="0"
-         value="Resident. No payment info on file."
          width="300"
-         word_wrap="true" />
+         word_wrap="true">
+	 Resident. No payment info on file.
+Linden.
+	 </text>
         <text
          follows="left|top"
 	 font.style="BOLD"
@@ -245,26 +264,25 @@
          width="300" />
          <expandable_text
          follows="all"
-         height="115"
+         height="113"
          layout="topleft"
          left="7"
          name="sl_groups"
-       top_pad="0"
-         width="300"
+         top_pad="0"
+         width="298"
          expanded_bg_visible="true"
          expanded_bg_color="DkGray">
             Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
         </expandable_text>
-      </panel>
+    </panel>
  </scroll_container>
+</panel>
  <panel
-     follows="bottom|left"
-     layout="topleft"
-     left="0"
-     name="profile_buttons_panel"
-     top_pad="2"
-     height="23"
-     width="303">
+         follows="bottom|left"
+         height="28"
+         layout="topleft"
+         name="profile_buttons_panel"
+         width="313">
         <button
          follows="bottom|left"
          height="23"
@@ -328,22 +346,23 @@
          top="5"
 	 left_pad="3"
          width="23" />-->
- </panel>
+        </panel>
  <panel
-     follows="bottom|left"
-     layout="topleft"
-     left="0"
-     top_pad="-22"
-     name="profile_me_buttons_panel"
-     visible="false"
-     height="23"
-     width="303">
+         follows="bottom|left"
+         height="28"
+         layout="topleft"
+     top_pad="-26"
+         name="profile_me_buttons_panel"
+         visible="false"
+	 width="313">
         <button
          follows="bottom|right"
          height="23"
-         left="10"
+         left="20"
+	 top="0"
          label="Edit Profile"
          name="edit_profile_btn"
+         tool_tip="Edit your personal information"
          width="130" />
         <button
          follows="bottom|right"
@@ -351,7 +370,8 @@
          label="Edit Appearance"
          left_pad="10"
          name="edit_appearance_btn"
-         right="-10"
+         tool_tip="Create/edit your appearance: physical data, clothes and etc."
          width="130" />
- </panel>
-</panel>
+        </panel>
+    </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 6324ec2bd8..c51447eaf0 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -26,8 +26,8 @@
      top="2"
      width="23" />
     <text_editor
-      allow_scroll="false" 
-      bg_visible="false" 
+      allow_scroll="false"
+      bg_visible="false"
       read_only = "true"
       follows="top|left|right"
       font="SansSerifHugeBold"
@@ -55,7 +55,7 @@
      halign="center"
      layout="topleft"
      left="10"
-	 min_width="333"
+     min_width="333"
      name="tabs"
      tab_min_width="80"
      tab_height="30"
-- 
cgit v1.2.3