merge

5 files changed, 527 insertions, 526 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 58e9d39807..fa7e3e86a3 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2816,8 +2816,7 @@
             <menu_item_call
              label="Dump Focus Holder"
              layout="topleft"
-             name="Dump Focus Holder"
-             shortcut="control|alt|F">
+             name="Dump Focus Holder">
                 <menu_item_call.on_click
                  function="Advanced.DumpFocusHolder" />
             </menu_item_call>
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 12a0a9155d..8327edfdd0 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -41,7 +41,7 @@
      height="535"
      width="313"
      border_size="0">
-      <panel
+      <layout_panel
          name="profile_stack"
          follows="all"
          layout="topleft"
@@ -49,176 +49,176 @@
          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
+        <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"
+                  layout="topleft"
+                  left="10"
+                  name="second_life_image_panel"
+                  top="0"
+                  width="300">
+              <texture_picker
+               allow_no_texture="true"
+               default_image_name="None"
+               enabled="false"
+               follows="top|left"
+               height="117"
                layout="topleft"
-	       follows="left|top|right"
-              name="scroll_content_panel"
-               top="0"
                left="0"
-               width="303">
-	 <panel
-         follows="left|top|right"
-         height="117"
-         layout="topleft"
-         left="10"
-         name="second_life_image_panel"
-         top="0"
-         width="300">
-            <texture_picker
-             allow_no_texture="true"
-             default_image_name="None"
-             enabled="false"
-             follows="top|left"
+               name="2nd_life_pic"
+               top="10"
+               width="102" />
+              <icon
+              height="102"
+              image_name="Blank"
+              layout="topleft"
+              name="2nd_life_edit_icon"
+              label=""
+              left="0"
+              tool_tip="Click the Edit Profile button below to change image"
+              top="10"
+              width="102" />
+              <text
+               follows="left|top|right"
+         font.style="BOLD"
+               height="15"
+               layout="topleft"
+               left_pad="10"
+               name="title_sl_descr_text"
+               text_color="white"
+               top_delta="0"
+               value="[SECOND_LIFE]:"
+               width="180" />
+              <expandable_text
+               follows="left|top|right"
+               height="95"
+               layout="topleft"
+               left="107"
+               textbox.max_length="512"
+               name="sl_description_edit"
+               top_pad="-3"
+               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|right"
              height="117"
              layout="topleft"
-             left="0"
-             name="2nd_life_pic"
-             top="10"
-             width="102" />
-           <icon
-           height="102"
-           image_name="Blank"
-           layout="topleft"
-           name="2nd_life_edit_icon"
-           label=""
-           left="0"
-           tool_tip="Click the Edit Profile button below to change image"
-           top="10"
-           width="102" />
+       top_pad="10"
+             left="10"
+             name="first_life_image_panel"
+             width="300">
+              <texture_picker
+               allow_no_texture="true"
+               default_image_name="None"
+               enabled="false"
+               follows="top|left"
+               height="117"
+               layout="topleft"
+               left="0"
+               name="real_world_pic"
+               width="102" />
+              <icon
+              height="102"
+              image_name="Blank"
+              layout="topleft"
+              name="real_world_edit_icon"
+              label=""
+              left="0"
+              tool_tip="Click the Edit Profile button below to change image"
+              top="4"
+              width="102" />
+              <text
+               follows="left|top|right"
+         font.style="BOLD"
+               height="15"
+               layout="topleft"
+               left_pad="10"
+               name="title_rw_descr_text"
+               text_color="white"
+               top_delta="0"
+               value="Real World:"
+               width="180" />
+              <expandable_text
+               follows="left|top|right"
+               height="95"
+               layout="topleft"
+               left="107"
+               textbox.max_length="512"
+               name="fl_description_edit"
+               top_pad="-3"
+               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
-             follows="left|top|right"
-	     font.style="BOLD"
+             follows="left|top"
              height="15"
+       font.style="BOLD"
+       font="SansSerifMedium"
              layout="topleft"
-             left_pad="10"
-             name="title_sl_descr_text"
-             text_color="white"
-             top_delta="0"
-             value="[SECOND_LIFE]:"
-             width="180" />
-            <expandable_text
-             follows="left|top|right"
-             height="95"
+             left="10"
+             name="homepage_edit"
+             top_pad="0"
+             value="http://librarianavengers.org"
+             width="300"
+             word_wrap="false"
+             use_ellipses="true"
+         />
+            <text
+             follows="left|top"
+           font.style="BOLD"
+             height="10"
              layout="topleft"
-             left="107"
-             textbox.max_length="512"
-             name="sl_description_edit"
-             top_pad="-3"
-             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|right"
-         height="117"
-         layout="topleft"
-	 top_pad="10"
-         left="10"
-         name="first_life_image_panel"
-         width="300">
-            <texture_picker
-             allow_no_texture="true"
-             default_image_name="None"
-             enabled="false"
-             follows="top|left"
-             height="117"
+             left="10"
+             name="title_member_text"
+             text_color="white"
+             top_pad="10"
+             value="Resident Since:"
+             width="300" />
+            <text
+             follows="left|top"
+             height="15"
              layout="topleft"
-             left="0"
-             name="real_world_pic"
-             width="102" />
-           <icon
-           height="102"
-           image_name="Blank"
-           layout="topleft"
-           name="real_world_edit_icon"
-           label=""
-           left="0"
-           tool_tip="Click the Edit Profile button below to change image"
-           top="4"
-           width="102" />
+             left="10"
+             name="register_date"
+             value="05/31/2376"
+             width="300"
+             word_wrap="true" />
             <text
-             follows="left|top|right"
-	     font.style="BOLD"
+             follows="left|top"
+       font.style="BOLD"
              height="15"
              layout="topleft"
-             left_pad="10"
-             name="title_rw_descr_text"
+             left="10"
+             name="title_acc_status_text"
              text_color="white"
-             top_delta="0"
-             value="Real World:"
-             width="180" />
-            <expandable_text
-             follows="left|top|right"
-             height="95"
-             layout="topleft"
-             left="107"
-             textbox.max_length="512"
-             name="fl_description_edit"
-             top_pad="-3"
-             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
-         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="300"
-         word_wrap="false"
-         use_ellipses="true"
-         />
-        <text
-         follows="left|top"
-	     font.style="BOLD"
-         height="10"
-         layout="topleft"
-         left="10"
-         name="title_member_text"
-         text_color="white"
-         top_pad="10"
-         value="Resident Since:"
-         width="300" />
-        <text
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="register_date"
-         value="05/31/2376"
-         width="300"
-         word_wrap="true" />
-        <text
-         follows="left|top"
-	 font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="title_acc_status_text"
-         text_color="white"
-         top_pad="5"
-         value="Account Status:"
-         width="300" />
-       <!-- <text
+             top_pad="5"
+             value="Account Status:"
+             width="300" />
+            <!-- <text
          type="string"
          follows="left|top"
          font="SansSerifSmall"
@@ -229,75 +229,75 @@
          top_delta="0"
 	 value="Go to Dashboard"
          width="100"/> -->
-         <text
-         follows="left|top"
-         height="28"
-         layout="topleft"
-         left="10"
-         name="acc_status_text"
-         top_pad="0"
-         width="300"
-         word_wrap="true">
-	 Resident. No payment info on file.
-Linden.
-	 </text>
-        <text
-         follows="left|top"
-	 font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="title_partner_text"
-         text_color="white"
-         top_pad="3"
-         value="Partner:"
-         width="300" />
-        <panel
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="partner_data_panel"
-         top_pad="0"
-         width="300">
+            <text
+            follows="left|top"
+            height="28"
+            layout="topleft"
+            left="10"
+            name="acc_status_text"
+            top_pad="0"
+            width="300"
+            word_wrap="true">
+              Resident. No payment info on file.
+              Linden.
+            </text>
             <text
              follows="left|top"
-             height="10"
+       font.style="BOLD"
+             height="15"
              layout="topleft"
-             left="0"
-             name="partner_text"
-             top="0"
-             value="[FIRST] [LAST]"
-         width="300"
-             word_wrap="true" />
-         </panel>
-        <text
-         follows="left|top"
-	 font.style="BOLD"
-         height="13"
-         layout="topleft"
-         left="10"
-         name="title_groups_text"
-         text_color="white"
-         top_pad="3"
-         value="Groups:"
-         width="300" />
-         <expandable_text
-         follows="all"
-         height="113"
-         layout="topleft"
-         left="7"
-         name="sl_groups"
-       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>
- </scroll_container>
-      </panel>
-<!-- <panel
+             left="10"
+             name="title_partner_text"
+             text_color="white"
+             top_pad="3"
+             value="Partner:"
+             width="300" />
+            <panel
+             follows="left|top"
+             height="15"
+             layout="topleft"
+             left="10"
+             name="partner_data_panel"
+             top_pad="0"
+             width="300">
+              <text
+               follows="left|top"
+               height="10"
+               layout="topleft"
+               left="0"
+               name="partner_text"
+               top="0"
+               value="[FIRST] [LAST]"
+           width="300"
+               word_wrap="true" />
+            </panel>
+            <text
+             follows="left|top"
+       font.style="BOLD"
+             height="13"
+             layout="topleft"
+             left="10"
+             name="title_groups_text"
+             text_color="white"
+             top_pad="3"
+             value="Groups:"
+             width="300" />
+            <expandable_text
+            follows="all"
+            height="113"
+            layout="topleft"
+            left="7"
+            name="sl_groups"
+          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>
+        </scroll_container>
+      </layout_panel>
+      <!-- <layout_panel
      follows="bottom|left"
      layout="topleft"
      left="0"
@@ -353,13 +353,14 @@ Linden.
          top="5"
          width="85" />
  </panel>-->
- <panel
+ <layout_panel
      follows="bottom|left"
      layout="topleft"
      left="0"
      top_pad="0"
      name="profile_me_buttons_panel"
      visible="false"
+     auto_resize="false" 
      height="28"
      width="313">
         <button
@@ -379,6 +380,6 @@ Linden.
          name="edit_appearance_btn"
          tool_tip="Create/edit your appearance: physical data, clothes and etc."
          width="130" />
- </panel>
+ </layout_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 9335db0623..73528b28ad 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -19,94 +19,94 @@
      height="517"
      width="313"
      border_size="0">
-        <panel
-         name="notes_stack"
+      <layout_panel
+       name="notes_stack"
+       follows="all"
+       layout="topleft"
+       top="0"
+       left="0"
+       height="475"
+       width="313">
+        <scroll_container
+         color="DkGray2"
          follows="all"
          layout="topleft"
-         top="0"
          left="0"
+         name="profile_scroll"
+         opaque="true"
          height="475"
-         width="313">
-            <scroll_container
-             color="DkGray2"
-             follows="all"
+         width="313"
+         top="0">
+          <panel
+           height="450"
+           layout="topleft"
+           name="profile_scroll_panel"
+           top="0"
+           left="0"
+           width="303">
+            <text
+             follows="left|top"
+             font="SansSerifBold"
+             height="16"
              layout="topleft"
-             left="0"
-             name="profile_scroll"
-             opaque="true"
-             height="475"
-             width="313"
-             top="0">
-              <panel
-               height="450"
-               layout="topleft"
-               name="profile_scroll_panel"
-               top="0"
-               left="0"
-               width="303">
-                <text
-                 follows="left|top"
-                 font="SansSerifBold"
-                 height="16"
-                 layout="topleft"
-                 left="10"
-                 name="status_message"
-                 text_color="white"
-                 top="20"
-                 value="My private notes:"
-                 width="293" />
-                <text_editor
-                 follows="left|top"
-                 height="120"
-                 layout="topleft"
-                 left="10"
-                 max_length="1000"
-                 name="notes_edit"
-                 text_color="DkGray"
-                 top_pad="10"
-                 width="280"
-                 word_wrap="true" />
-                <text
-                 follows="left|top"
-                 font="SansSerifBold"
-                 height="16"
-                 layout="topleft"
-                 left="10"
-                 name="status_message2"
-                 text_color="white"
-                 top_pad="30"
-                 value="Allow this person to:"
-                 width="293" />
-                <check_box
-                 enabled="false"
-                 height="16"
-                 label="See my online status"
-                 layout="topleft"
-                 left="20"
-                 name="status_check"
-                 width="293" />
-                <check_box
-                 enabled="false"
-                 height="16"
-                 label="See me on the map"
-                 layout="topleft"
-                 left="20"
-                 name="map_check"
-                 width="293" />
-                <check_box
-                 enabled="false"
-                 height="16"
-                 label="Edit, delete or take my objects"
-                 layout="topleft"
-                 left="20"
-                 name="objects_check"
-                 width="293" />
-              </panel>
-            </scroll_container>
-        </panel>
-        <panel
-         follows="bottom|left"
-         height="30"
+             left="10"
+             name="status_message"
+             text_color="white"
+             top="20"
+             value="My private notes:"
+             width="293" />
+            <text_editor
+             follows="left|top"
+             height="120"
+             layout="topleft"
+             left="10"
+             max_length="1000"
+             name="notes_edit"
+             text_color="DkGray"
+             top_pad="10"
+             width="280"
+             word_wrap="true" />
+            <text
+             follows="left|top"
+             font="SansSerifBold"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="status_message2"
+             text_color="white"
+             top_pad="30"
+             value="Allow this person to:"
+             width="293" />
+            <check_box
+             enabled="false"
+             height="16"
+             label="See my online status"
+             layout="topleft"
+             left="20"
+             name="status_check"
+             width="293" />
+            <check_box
+             enabled="false"
+             height="16"
+             label="See me on the map"
+             layout="topleft"
+             left="20"
+             name="map_check"
+             width="293" />
+            <check_box
+             enabled="false"
+             height="16"
+             label="Edit, delete or take my objects"
+             layout="topleft"
+             left="20"
+             name="objects_check"
+             width="293" />
+          </panel>
+        </scroll_container>
+      </layout_panel>
+      <layout_panel
+       follows="bottom|left"
+       height="30"
          layout="topleft"
          left="0"
          name="notes_buttons_panel"
@@ -164,6 +164,6 @@
          left_pad="3"
          top="5"
          width="80" />
-        </panel>
+        </layout_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 5ccc964c9a..43947262ec 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -38,10 +38,10 @@
      layout="topleft"
      left="0"
      top="0"
-     height="535"
+     height="517"
      width="313"
      border_size="0">
-      <panel
+      <layout_panel
          name="profile_stack"
          follows="all"
          layout="topleft"
@@ -49,156 +49,156 @@
          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
+        <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"
+                  layout="topleft"
+                  left="10"
+                  name="second_life_image_panel"
+                  top="0"
+                  width="303">
+              <texture_picker
+               allow_no_texture="true"
+               default_image_name="None"
+               enabled="false"
+               follows="top|left"
+               height="117"
                layout="topleft"
-	       follows="left|top|right"
-               name="profile_scroll_panel"
-               top="0"
                left="0"
-               width="303">
-	 <panel
-         follows="left|top|right"
-         height="117"
-         layout="topleft"
-         left="10"
-         name="second_life_image_panel"
-         top="0"
-         width="303">
-            <texture_picker
-             allow_no_texture="true"
-             default_image_name="None"
-             enabled="false"
-             follows="top|left"
+               name="2nd_life_pic"
+               top="10"
+               width="102" />
+              <text
+               follows="left|top|right"
+         font.style="BOLD"
+               height="15"
+               layout="topleft"
+               left_pad="10"
+               name="title_sl_descr_text"
+               text_color="white"
+               top_delta="0"
+               value="[SECOND_LIFE]:"
+               width="180" />
+              <expandable_text
+               follows="left|top|right"
+               height="95"
+               layout="topleft"
+               left="107"
+               textbox.max_length="512"
+               name="sl_description_edit"
+               top_pad="-3"
+               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.
+              </expandable_text>
+            </panel>
+            <panel
+             follows="left|top|right"
              height="117"
              layout="topleft"
-             left="0"
-             name="2nd_life_pic"
-             top="10"
-             width="102" />
+       top_pad="10"
+             left="10"
+             name="first_life_image_panel"
+             width="303">
+              <texture_picker
+               allow_no_texture="true"
+               default_image_name="None"
+               enabled="false"
+               follows="top|left"
+               height="117"
+               layout="topleft"
+               left="0"
+               name="real_world_pic"
+               width="102" />
+              <text
+               follows="left|top|right"
+         font.style="BOLD"
+               height="15"
+               layout="topleft"
+               left_pad="10"
+               name="title_rw_descr_text"
+               text_color="white"
+               top_delta="0"
+               value="Real World:"
+               width="180" />
+              <expandable_text
+               follows="left|top|right"
+               height="95"
+               layout="topleft"
+               left="107"
+               textbox.max_length="512"
+               name="fl_description_edit"
+               top_pad="-3"
+               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.
+              </expandable_text>
+            </panel>
             <text
-             follows="left|top|right"
-	     font.style="BOLD"
-             height="15"
+              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="300"
+              word_wrap="false"
+              use_ellipses="true"
+         />
+            <text
+             follows="left|top"
+           font.style="BOLD"
+             height="10"
              layout="topleft"
-             left_pad="10"
-             name="title_sl_descr_text"
+             left="10"
+             name="title_member_text"
              text_color="white"
-             top_delta="0"
-             value="[SECOND_LIFE]:"
-             width="180" />
-            <expandable_text
-             follows="left|top|right"
-             height="95"
-             layout="topleft"
-             left="107"
-             textbox.max_length="512"
-             name="sl_description_edit"
-             top_pad="-3"
-             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.
-            </expandable_text>
-        </panel>
-        <panel
-         follows="left|top|right"
-         height="117"
-         layout="topleft"
-	 top_pad="10"
-         left="10"
-         name="first_life_image_panel"
-         width="303">
-            <texture_picker
-             allow_no_texture="true"
-             default_image_name="None"
-             enabled="false"
-             follows="top|left"
-             height="117"
+             top_pad="10"
+             value="Resident Since:"
+             width="300" />
+            <text
+             follows="left|top"
+             height="15"
              layout="topleft"
-             left="0"
-             name="real_world_pic"
-             width="102" />
+             left="10"
+             name="register_date"
+             value="05/31/2376"
+             width="300"
+             word_wrap="true" />
             <text
-             follows="left|top|right"
-	     font.style="BOLD"
+             follows="left|top"
+       font.style="BOLD"
              height="15"
              layout="topleft"
-             left_pad="10"
-             name="title_rw_descr_text"
+             left="10"
+             name="title_acc_status_text"
              text_color="white"
-             top_delta="0"
-             value="Real World:"
-             width="180" />
-            <expandable_text
-             follows="left|top|right"
-             height="95"
-             layout="topleft"
-             left="107"
-             textbox.max_length="512"
-             name="fl_description_edit"
-             top_pad="-3"
-             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.
-            </expandable_text>
-        </panel>
-       <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="300"
-         word_wrap="false"
-         use_ellipses="true"
-         />
-        <text
-         follows="left|top"
-	     font.style="BOLD"
-         height="10"
-         layout="topleft"
-         left="10"
-         name="title_member_text"
-         text_color="white"
-         top_pad="10"
-         value="Resident Since:"
-         width="300" />
-        <text
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="register_date"
-         value="05/31/2376"
-         width="300"
-         word_wrap="true" />
-        <text
-         follows="left|top"
-	 font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="title_acc_status_text"
-         text_color="white"
-         top_pad="5"
-         value="Account Status:"
-         width="300" />
-       <!-- <text
+             top_pad="5"
+             value="Account Status:"
+             width="300" />
+            <!-- <text
          type="string"
          follows="left|top"
          font="SansSerifSmall"
@@ -209,79 +209,80 @@
          top_delta="0"
 	 value="Go to Dashboard"
          width="100"/> -->
-        <text
-         follows="left|top"
-         height="28"
-         layout="topleft"
-         left="10"
-         name="acc_status_text"
-         top_pad="0"
-         width="300"
-         word_wrap="true">
-	 Resident. No payment info on file.
-Linden.
-	 </text>
-        <text
-         follows="left|top"
-	 font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="title_partner_text"
-         text_color="white"
-         top_pad="3"
-         value="Partner:"
-         width="300" />
-        <panel
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="partner_data_panel"
-         top_pad="0"
-         width="300">
             <text
              follows="left|top"
-             height="10"
+             height="28"
              layout="topleft"
-             left="0"
-             name="partner_text"
-             top="0"
-             value="[FIRST] [LAST]"
-         width="300"
-             word_wrap="true" />
-         </panel>
-        <text
-         follows="left|top"
-	 font.style="BOLD"
-         height="13"
-         layout="topleft"
-         left="10"
-         name="title_groups_text"
-         text_color="white"
-         top_pad="3"
-         value="Groups:"
-         width="300" />
-         <expandable_text
-         follows="all"
-         height="113"
-         layout="topleft"
-         left="7"
-         name="sl_groups"
-         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>
- </scroll_container>
-</panel>
- <panel
-         follows="bottom|left"
+             left="10"
+             name="acc_status_text"
+             top_pad="0"
+             width="300"
+             word_wrap="true">
+              Resident. No payment info on file.
+              Linden.
+            </text>
+            <text
+             follows="left|top"
+       font.style="BOLD"
+             height="15"
+             layout="topleft"
+             left="10"
+             name="title_partner_text"
+             text_color="white"
+             top_pad="3"
+             value="Partner:"
+             width="300" />
+            <panel
+             follows="left|top"
+             height="15"
+             layout="topleft"
+             left="10"
+             name="partner_data_panel"
+             top_pad="0"
+             width="300">
+              <text
+               follows="left|top"
+               height="10"
+               layout="topleft"
+               left="0"
+               name="partner_text"
+               top="0"
+               value="[FIRST] [LAST]"
+           width="300"
+               word_wrap="true" />
+            </panel>
+            <text
+             follows="left|top"
+       font.style="BOLD"
+             height="13"
+             layout="topleft"
+             left="10"
+             name="title_groups_text"
+             text_color="white"
+             top_pad="3"
+             value="Groups:"
+             width="300" />
+            <expandable_text
+            follows="all"
+            height="113"
+            layout="topleft"
+            left="7"
+            name="sl_groups"
+            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>
+        </scroll_container>
+      </layout_panel>
+      <layout_panel
+              follows="bottom|left"
          height="28"
          layout="topleft"
          name="profile_buttons_panel"
+         auto_resize="false" 
          width="313">
         <button
          follows="bottom|left"
@@ -346,15 +347,14 @@ Linden.
          top="5"
 	 left_pad="3"
          width="23" />-->
-        </panel>
- <panel
+        </layout_panel>
+      <layout_panel
          follows="bottom|left"
          height="28"
          layout="topleft"
-     top_pad="-26"
          name="profile_me_buttons_panel"
          visible="false"
-	 width="313">
+	       width="313">
         <button
          follows="bottom|right"
          height="23"
@@ -372,6 +372,7 @@ Linden.
          name="edit_appearance_btn"
          tool_tip="Create/edit your appearance: physical data, clothes and etc."
          width="130" />
-        </panel>
-    </layout_stack>
+        </layout_panel>
+    
+</layout_stack>
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index b738e72423..51974be854 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -28,7 +28,7 @@
 			 name="panel_main_inventory"
 			 top="0"
 			 label=""
-			 height="500"
+			 height="545"
 			 width="330" />
 		<panel
 			 height="25"