Automated merge with ssh://hg.lindenlab.com/james/gooey

7 files changed, 395 insertions, 369 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
index 042b4226c3..9977e85a9d 100644
--- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
@@ -71,83 +71,4 @@
      name="font_checkbox"
      top_pad="14"
      width="150" />
-
-<chiclet_im_p2p
- height="25"
- name="im_p2p_chiclet"
- show_speaker="false"
- width="25">
-    <chiclet_im_p2p.chiclet_button
-     height="25"
-     image_selected="PushButton_Selected"
-     image_unselected="PushButton_Off"
-     name="chiclet_button"
-     tab_stop="false"
-     width="25"/>
-    <chiclet_im_p2p.speaker
-     auto_update="true"
-     draw_border="false"
-     height="25"
-     left="25"
-     name="speaker"
-     visible="false"
-     width="20" />
-    <chiclet_im_p2p.avatar_icon
-     bottom="3"
-     follows="left|top|bottom"
-     height="20"
-     left="2"
-     mouse_opaque="false"
-     name="avatar_icon"
-     width="21" />
-    <chiclet_im_p2p.unread_notifications
-     height="25"
-     font_halign="center"
-     left="25"
-     mouse_opaque="false"
-     name="unread"
-     text_color="white"
-     v_pad="5"
-     visible="false"
-     width="20"/>
-    <chiclet_im_p2p.new_message_icon
-  bottom="11"
-  height="14"
-  image_name="Unread_Chiclet"
-  left="12"
-  name="new_message_icon"
-  visible="false"
-  width="14" />
-</chiclet_im_p2p>
-
-
-<chiclet_offer
- height="25"
- name="offer_chiclet"
- width="25">
- <chiclet_offer.chiclet_button
-  height="25"
-  image_selected="PushButton_Selected"
-  image_unselected="PushButton_Off"
-  name="chiclet_button"
-  tab_stop="false"
-  width="25"/>
- <chiclet_offer.icon
-  bottom="3"
-  default_icon="Generic_Object_Small"
-  follows="all"
-  height="19"
-  left="3"
-  mouse_opaque="false"
-  name="chiclet_icon"
-  width="19" />
- <chiclet_offer.new_message_icon
-  bottom="11"
-  height="14"
-  image_name="Unread_Chiclet"
-  left="12"
-  name="new_message_icon"
-  visible="false"
-  width="14" />
-</chiclet_offer>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index af73faf9a1..96185bad56 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- follows="all"
-     height="395"
  label="General"
+ follows="all"
+ height="604"
+ width="313"
  class="panel_group_general"
- layout="topleft"
- name="general_tab"
- width="323">
+ name="general_tab">
     <panel.string
      name="help_text">
         The General tab contains general information about this group, a list of members, general Group Preferences and member options.
@@ -25,12 +24,14 @@ Hover your mouse over the options for more help.
      type="string"
      follows="left|top|right"
      left="5"
-     height="60"
+     height="150"
      layout="topleft"
      max_length="511"
      name="charter"
      top="5"
      right="-1"
+    bg_readonly_color="DkGray2"
+    text_readonly_color="White"
      word_wrap="true">
      Group Charter
     </text_editor>
@@ -38,8 +39,8 @@ Hover your mouse over the options for more help.
      column_padding="0"
      draw_heading="true"
      follows="left|top|right"
-     heading_height="20"
-     height="156"
+     heading_height="23"
+     height="200"
      layout="topleft"
      left="0"
      right="-1"
@@ -60,17 +61,29 @@ Hover your mouse over the options for more help.
          height="12"
          layout="left|top|right"
          left="5"
+         text_color="EmphasisColor"
+         name="my_group_settngs_label"
+         top_pad="10"
+         width="300">
+           Me
+        </text>
+         <text
+         follows="left|top|right"
+         type="string"
+         height="12"
+         layout="left|top|right"
+         left="10"
          name="active_title_label"
          top_pad="5"
          width="300">
-            My Title
+            My title:
         </text>
         <combo_box
          follows="left|top|right"
-         height="20"
+         height="23"
          layout="topleft"
-         left="5"
-     right="-5"
+         left="10"
+         right="-5"
          name="active_title"
          tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active."
          top_pad="2" />
@@ -79,7 +92,7 @@ Hover your mouse over the options for more help.
          font="SansSerifSmall"
          label="Receive group notices"
          layout="topleft"
-         left="5"
+         left="10"
          name="receive_notices"
          tool_tip="Sets whether you want to receive Notices from this group.  Uncheck this box if this group is spamming you."
          top_pad="5"
@@ -88,36 +101,46 @@ Hover your mouse over the options for more help.
          height="16"
          label="Show in my profile"
          layout="topleft"
-         left="5"
+         left="10"
          name="list_groups_in_profile"
          tool_tip="Sets whether you want to show this group in your profile"
          top_pad="5"
          width="295" />
-        <panel
+   <panel
          background_visible="true"
          bevel_style="in"
          border="true"
          bg_alpha_color="FloaterUnfocusBorderColor"
          follows="left|top|right"
-         height="88"
+         height="140"
+         width="313"
          layout="topleft"
-         left="2"
-         right="-1"
+         left="0"
          name="preferences_container"
-         top_pad="2">
+         top_pad="5">
+        <text
+         follows="left|top|right"
+         type="string"
+         height="12"
+         layout="left|top|right"
+         left="5"
+         text_color="EmphasisColor"
+         name="group_settngs_label"
+         width="300">
+         Group
+        </text>
         <check_box
          follows="right|top|left"
          height="16"
-         label="Open enrollment"
+         label="Anyone can join"
          layout="topleft"
          left="10"
          name="open_enrollement"
          tool_tip="Sets whether this group allows new members to join without being invited."
-         top_pad="5"
          width="90" />
         <check_box
          height="16"
-         label="Enrollment fee"
+         label="Cost to join"
          layout="topleft"
          left_delta="0"
          name="check_enrollment_fee"
@@ -126,27 +149,26 @@ Hover your mouse over the options for more help.
          width="300" />
         <spinner
          decimal_digits="0"
-         follows="left|top|right"
+         follows="left|top"
          halign="left"
-         height="16"
+         height="23"
          increment="1"
          label_width="15"
          label="L$"
          layout="topleft"
-         right="-30"
          max_val="99999"
-         left_pad="0"
+         left="30"
          name="spin_enrollment_fee"
          tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked."
-         width="80" />
-         <combo_box
-         follows="left|top|right"
-         height="20"
+         width="170" />
+        <combo_box
+         follows="left|top"
+         height="23"
          layout="topleft"
          left="10"
          name="group_mature_check"
          tool_tip="Sets whether your group contains information rated as Moderate"
-         top_pad="0"
+         top_pad="4"
          width="190">
             <combo_box.item
              label="General Content"
@@ -158,7 +180,7 @@ Hover your mouse over the options for more help.
              value="Mature" />
         </combo_box>
         <check_box
-         follows="left|top|right"
+         follows="left|top"
          height="16"
          initial_value="true"
          label="Show in search"
@@ -168,5 +190,6 @@ Hover your mouse over the options for more help.
          tool_tip="Let people see this group in search results"
          top_pad="4"
          width="300" />
+
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 673052c3b5..4e017819c1 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -2,17 +2,17 @@
 <panel
 background_visible="true"
  follows="all"
- height="635"
- label="Group Info"
+ height="570"
+ label="Group Profile"
  layout="topleft"
- min_height="460"
+ min_height="350"
  left="0"
  top="20"
  name="GroupInfo"
- width="323">
+ width="313">
     <panel.string
      name="default_needs_apply_text">
-        There are unsaved changes to the current tab
+        There are unsaved changes
     </panel.string>
     <panel.string
      name="want_apply_text">
@@ -26,6 +26,14 @@ background_visible="true"
      name="group_join_free">
         Free
     </panel.string>
+    <panel
+      name="group_info_top"
+      follows="top|left"
+      top="0"
+      left="0"
+      height="129"
+      width="313"
+      layout="topleft">
     <button
      follows="top|right"
      height="23"
@@ -37,17 +45,19 @@ background_visible="true"
      top="2"
      width="23" />
     <text
-     follows="top|left|right"
-     font="SansSerifHugeBold"
-     height="26"
      layout="topleft"
-     left_pad="10"
      name="group_name"
-     text_color="white"
-     top="0"
      value="(Loading...)"
-     use_ellipses="true"
-     width="300" />
+      font="SansSerifHuge"
+      height="20"
+      left_pad="5"
+      text_color="white"
+      top="3"
+      use_ellipses="true"
+      width="270"
+      follows="top|left"
+      word_wrap="true"
+      mouse_opaque="false"/>
     <line_editor
      follows="left|top"
      font="SansSerif"
@@ -57,7 +67,7 @@ background_visible="true"
      max_length="35"
      name="group_name_editor"
      top_delta="5"
-     width="250"
+     width="270"
      height="20"
      visible="false" />
     <texture_picker
@@ -65,21 +75,24 @@ background_visible="true"
      height="113"
      label=""
      layout="topleft"
-     left="20"
+     left="10"
      name="insignia"
      tool_tip="Click to choose a picture"
      top_pad="5"
      width="100" />
-    <text
+      <text
+      font="SansSerifSmall"
+      text_color="White_50"
+      width="190"
+      follows="top|left"
+      layout="topleft"
+      mouse_opaque="false"
      type="string"
-     follows="left|top"
      height="16"
      length="1"
-     layout="topleft"
      left_pad="10"
      name="prepend_founded_by"
-     top_delta="0"
-     width="140">
+     top_delta="0">
       Founder:
     </text>
     <name_box
@@ -92,9 +105,9 @@ background_visible="true"
      name="founder_name"
      top_pad="2"
      use_ellipses="true"
-     width="140" />
+     width="190" />
     <text
-    font="SansSerifBig"
+    font="SansSerifMedium"
     text_color="EmphasisColor"
      type="string"
      follows="left|top"
@@ -104,7 +117,7 @@ background_visible="true"
      name="join_cost_text"
      top_pad="10"
      visible="true"
-     width="140">
+     width="190">
       Free
     </text>
     <button
@@ -116,17 +129,31 @@ background_visible="true"
      name="btn_join"
      visible="true"
      width="120" />
+    </panel>
+   <layout_stack
+     name="layout"
+     orientation="vertical"
+      follows="all"
+     left="0"
+     top_pad="0"
+     height="437"
+     width="313"
+     border_size="0">
+   <layout_panel
+      name="group_accordions"
+      follows="all"
+      layout="topleft"
+      auto_resize="true"
+      >
    <accordion
+     left="0"
+     top="0"
            single_expansion="true"
              follows="all"
-             height="478"
              layout="topleft"
-             left="0"
-             name="groups_accordion"
-             top_pad="10"
-             width="323">
-             <accordion_tab
-            expanded="false"
+             name="groups_accordion">
+         <accordion_tab
+            expanded="true"
             layout="topleft"
             name="group_general_tab"
             title="General">
@@ -136,12 +163,13 @@ background_visible="true"
              filename="panel_group_general.xml"
              layout="topleft"
              left="0"
+             follows="all"
              help_topic="group_general_tab"
              name="group_general_tab_panel"
              top="0" />
          </accordion_tab>
          <accordion_tab
-            expanded="true"
+            expanded="false"
             layout="topleft"
             name="group_roles_tab"
             title="Roles">
@@ -184,28 +212,37 @@ background_visible="true"
          top="0" />
          </accordion_tab>
          </accordion>
-   <panel
+   </layout_panel>
+   <layout_panel
+         height="25"
+         layout="topleft"
+         auto_resize="false"
+         left="0"
    name="button_row"
-   height="23"
    follows="bottom|left"
-   top_pad="-1"
-   width="323">
+   width="313">
    <button
-     follows="top|left"
-     height="22"
+    follows="bottom|left"
+     height="23"
      image_overlay="Refresh_Off"
      layout="topleft"
-     left="10"
+     left="5"
+     top="0"
      name="btn_refresh"
      width="23" />
-    <button
-     height="22"
-     label="Create"
-     label_selected="New group"
+   <button
+    follows="bottom|left"
+                 height="18"
+                 image_selected="AddItem_Press"
+                 image_unselected="AddItem_Off"
+                 image_disabled="AddItem_Disabled"
+                 layout="topleft"
+                 left_pad="2"
+                 top_delta="3"
      name="btn_create"
-     left_pad="10"
-     visible="false"
-     width="100" />
+               visible="true"
+                 tool_tip="Create a new Group"
+                 width="18" />
    <!-- <button
      left_pad="10"
      height="20"
@@ -215,28 +252,30 @@ background_visible="true"
      visible="false"
      width="65" />-->
      <button
-     follows="bottom|right"          
-     label="Group Chat"
+      follows="bottom|left"
+     label="Chat"
      name="btn_chat"
-     right="-184"
-     left_pad="2"     
-     height="22"          
-     width="85" />
-     <button
-     follows="bottom|right"          
-     label="Group Call"
+     left_pad="2"
+     height="23"
+     top_delta="-3"
+     width="60" />
+    <button
+         follows="bottom|left"
+         left_pad="2"
+         height="23"
      name="btn_call"
-     right="-97"
-     left_pad="2"     
-     height="22"          
-     width="85" />
+         label="Group Call"
+         layout="topleft"
+         tool_tip="Call this group"
+         width="95" />
      <button
-     height="22"
+     follows="bottom|left"
+     height="23"
      label="Save"
      label_selected="Save"
      name="btn_apply"
-     left_pad="10"
-     right="-10"
+     left_pad="2"
      width="85" />
-     </panel>
+     </layout_panel>
+  </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index 2075d7e05b..38b0f234d5 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -2,13 +2,13 @@
 <panel
  border="false"
  follows="all"
- height="380"
+ height="500"
  label="Land &amp; L$"
  layout="topleft"
  left="0"
  name="land_money_tab"
  top="0"
- width="310">
+ width="313">
     <panel.string
      name="help_text">
    A warning appears until the Total Land in Use is less than or = to the Total Contribution.
@@ -41,16 +41,24 @@
      width="260">
         Group Owned Land
     </text> -->
+   <panel
+          name="layout_panel_landmoney"
+          follows="top|left|right"
+          left="0"
+          right="-1"
+          height="250"
+          width="313"
+          >
     <scroll_list
      draw_heading="true"
      follows="top|left|right"
-     heading_height="20"
      height="130"
      layout="topleft"
      left="0"
+     right="-1"
      top="0"
      name="group_parcel_list"
-     width="310">
+     width="313">
         <scroll_list.columns
          label="Parcel"
          name="name"
@@ -67,16 +75,12 @@
          label="Area"
          name="area"
          width="50" />
-        <scroll_list.columns
-         label=""
-         name="hidden"
-         width="-1" />
     </scroll_list>
     <text
      type="string"
      follows="left|top"
      halign="right"
-     height="15"
+     height="16"
      layout="topleft"
      left="0"
      name="total_contributed_land_label"
@@ -87,30 +91,30 @@
     text_color="EmphasisColor"
      type="string"
      follows="left|top"
-     height="15"
+     height="16"
      layout="topleft"
      left_pad="5"
      name="total_contributed_land_value"
      top_delta="0"
-     width="120">
+     width="90">
         [AREA] m²
     </text>
     <button
      follows="top"
-     height="20"
+     height="23"
      label="Map"
      label_selected="Map"
      layout="topleft"
      name="map_button"
-     right="-5"
+     top_delta="-4"
      left_pad="0"
-     width="95"
+     width="60"
      enabled="false" />
     <text
      type="string"
      follows="left|top"
      halign="right"
-     height="15"
+     height="16"
      layout="topleft"
      left="0"
      name="total_land_in_use_label"
@@ -122,7 +126,7 @@
     text_color="EmphasisColor"
      type="string"
      follows="left|top"
-     height="15"
+     height="16"
      layout="topleft"
      left_pad="5"
      name="total_land_in_use_value"
@@ -134,7 +138,7 @@
      type="string"
      follows="left|top"
      halign="right"
-     height="15"
+     height="16"
      layout="topleft"
      left="0"
      name="land_available_label"
@@ -146,7 +150,7 @@
     text_color="EmphasisColor"
      type="string"
      follows="left|top"
-     height="15"
+     height="16"
      layout="topleft"
      left_pad="5"
      name="land_available_value"
@@ -158,7 +162,7 @@
      type="string"
      follows="left|top"
      halign="right"
-     height="15"
+     height="16"
      layout="topleft"
      left="0"
      name="your_contribution_label"
@@ -190,21 +194,22 @@
      <text
      type="string"
      follows="left|top"
-     halign="right"
-     height="12"
+     halign="left"
+     height="16"
      layout="topleft"
      left="140"
      name="your_contribution_max_value"
      top_pad="2"
-     width="95">
+     width="170">
         ([AMOUNT] max)
     </text>
     <icon
-     height="18"
-     image_name="BuyArrow_Over"
+     height="16"
+     image_name="Parcel_Exp_Color"
      layout="topleft"
      left="75"
      name="group_over_limit_icon"
+     color="Green"
      top_pad="0"
      visible="true"
      width="18" />
@@ -212,12 +217,11 @@
      follows="left|top"
      type="string"
      word_wrap="true"
-     font="SansSerifSmall"
      height="20"
      layout="topleft"
      left_pad="2"
      name="group_over_limit_text"
-     text_color="EmphasisColor"
+     text_color="ColorPaletteEntry29"
      top_delta="0"
      width="213">
         More land credits are needed to support land in use
@@ -235,39 +239,39 @@
      width="100">
         Group L$
     </text>
+    </panel>
     <tab_container
      follows="all"
-     height="173"
+     height="230"
      halign="center"
      layout="topleft"
      left="0"
+     right="-1"
      name="group_money_tab_container"
      tab_position="top"
-     tab_height="20"
      top_pad="2"
-     tab_min_width="75"
-     width="310">
+     tab_min_width="90"
+     width="313">
         <panel
          border="false"
          follows="all"
-         height="173"
          label="PLANNING"
          layout="topleft"
          left="0"
          help_topic="group_money_planning_tab"
          name="group_money_planning_tab"
-         top="5"
-         width="300">
+         top="0"
+         width="313">
             <text_editor
              type="string"
              follows="all"
-             height="140"
+             height="200"
              layout="topleft"
              left="0"
              max_length="4096"
              name="group_money_planning_text"
              top="2"
-             width="300"
+             width="313"
              word_wrap="true">
                 Loading...
             </text_editor>
@@ -275,24 +279,23 @@
       <panel
          border="false"
          follows="all"
-         height="173"
          label="DETAILS"
          layout="topleft"
          left="0"
          help_topic="group_money_details_tab"
          name="group_money_details_tab"
          top="0"
-         width="300">
+         width="313">
           <text_editor
              type="string"
              follows="all"
-             height="140"
+             height="185"
              layout="topleft"
              left="0"
              max_length="4096"
              name="group_money_details_text"
              top="2"
-             width="300"
+             width="313"
              word_wrap="true">
                 Loading...
             </text_editor>
@@ -303,59 +306,58 @@
 	     layout="topleft"
 	     name="earlier_details_button"
 	     tool_tip="Back"
-             right="-45"
-             bottom="0"
+             left="200"
+             top_pad="0"
 	     width="25" />
              <button
 	     follows="left|top"
 	     height="18"
 	     image_overlay="Arrow_Right_Off"
 	     layout="topleft"
-	     left_pad="10"
        name="later_details_button"
 	     tool_tip="Next"
+             left_pad="15"
 	     width="25" />
         </panel>
       <panel
          border="false"
          follows="all"
-         height="173"
          label="SALES"
          layout="topleft"
-         left_delta="0"
+         left="0"
          help_topic="group_money_sales_tab"
          name="group_money_sales_tab"
          top="0"
-         width="300">
+         width="313">
             <text_editor
              type="string"
              follows="all"
-             height="140"
+             height="185"
              layout="topleft"
              left="0"
              max_length="4096"
              name="group_money_sales_text"
              top="2"
-             width="300"
+             width="313"
              word_wrap="true">
                 Loading...
             </text_editor>
-                         <button
-             bottom="0"
+           <button
 	     follows="left|top"
 	     height="18"
 	     image_overlay="Arrow_Left_Off"
 	     layout="topleft"
 	     name="earlier_sales_button"
 	     tool_tip="Back"
-         right="-45"
+             left="200"
+             top_pad="0"
 	     width="25" />
              <button
 	     follows="left|top"
 	     height="18"
 	     image_overlay="Arrow_Right_Off"
 	     layout="topleft"
-	     left_pad="10"
+	     left_pad="15"
          name="later_sales_button"
 	     tool_tip="Next"
 	     width="25" />
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 0d9c2c2162..5f46ad7860 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="all"
- height="463"
+ height="530"
  label="Notices"
  layout="topleft"
  left="0"
  name="notices_tab"
  top="0"
- width="310">
+ width="313">
     <panel.string
      name="help_text">
         Notices let you send a message and an optionally attached item.
@@ -23,26 +23,28 @@ You can turn off Notices on the General tab.
      type="string"
      word_wrap="true"
      height="24"
-     halign="right"
+     halign="left"
      layout="topleft"
+     text_color="White_50"
      left="5"
      name="lbl2"
+     right="-1"
      top="5"
      width="300">
      Notices are kept for 14 days.
 Maximum 200 per group daily
     </text>
     <scroll_list
-      follows="left|top"
+     follows="left|top|right"
      column_padding="0"
      draw_heading="true"
-     heading_height="16"
-     height="125"
+     height="175"
      layout="topleft"
-     left="2"
+     left="0"
+     right="-1"
      name="notice_list"
      top_pad="0"
-     width="300">
+     width="313">
         <scroll_list.columns
          label=""
          name="icon"
@@ -71,8 +73,8 @@ Maximum 200 per group daily
      visible="false">
         None found
     </text>
-         <button
-       follows="bottom|left"
+      <button
+       follows="top|left"
        height="18"
        image_selected="AddItem_Press"
        image_unselected="AddItem_Off"
@@ -85,24 +87,25 @@ Maximum 200 per group daily
        width="18" />
      <button
      follows="top|left"
-     height="22"
+     height="23"
      image_overlay="Refresh_Off"
      layout="topleft"
      name="refresh_notices"
-     right="-5"
+     left_pad="230"
      tool_tip="Refresh list of notices"
      top_delta="0"
      width="23" />
     <panel
-     follows="left|top"
+     follows="left|top|right"
      height="280"
      label="Create New Notice"
      layout="topleft"
      left="0"
+     right="-1"
      top_pad="0"
      visible="true"
      name="panel_create_new_notice"
-     width="300">
+         width="313">
         <text
          follows="left|top"
          type="string"
@@ -204,13 +207,16 @@ Maximum 200 per group daily
          width="72" />
         <button
          follows="left|top"
-         height="23"
-         label="Remove"
          layout="topleft"
-         left="70"
+         left="140"
          name="remove_attachment"
-         top_delta="45"
-         width="90" />
+         top_delta="50"
+                 height="18"
+                 image_selected="TrashItem_Press"
+                 image_unselected="TrashItem_Off"
+                 image_disabled="TrashItem_Disabled"
+                 tool_tip="Remove attachment from your notification"
+                 width="18" />
         <button
          follows="left|top"
          height="23"
@@ -231,18 +237,19 @@ Maximum 200 per group daily
          width="280" />
    </panel>
     <panel
-     follows="left|top"
+     follows="left|top|right"
      height="280"
      label="View Past Notice"
      layout="topleft"
      left="0"
+     right="-1"
      visible="false"
      name="panel_view_past_notice"
-     top="180"
-     width="300">
+     top="230"
+    width="313">
         <text
          type="string"
-         font="SansSerifBig"
+         font="SansSerifMedium"
          height="16"
          layout="topleft"
          left="10"
@@ -280,7 +287,7 @@ Maximum 200 per group daily
          border_style="line"
          border_thickness="1"
          enabled="false"
-         height="16"
+         height="20"
          layout="topleft"
          left_pad="3"
          max_length="63"
@@ -301,40 +308,35 @@ Maximum 200 per group daily
             Message:
         </text>
         <text_editor
+                     follows="top|left|right"
          enabled="false"
          height="160"
          layout="topleft"
-         left="10"
+         left="0"
+         right="-1"
          max_length="511"
          name="view_message"
-         top_delta="-35"
-         width="285"
+         top_delta="-40"
+         width="313"
          word_wrap="true" />
         <line_editor
          enabled="false"
-         height="16"
+         height="20"
          layout="topleft"
-         left_delta="0"
+         left="5"
          max_length="63"
          mouse_opaque="false"
          name="view_inventory_name"
          top_pad="8"
-         width="285" />
-        <icon
-         height="16"
-         layout="topleft"
-         left_delta="0"
-         name="view_inv_icon"
-         top_delta="0"
-         width="16" />
+         width="250"/>
         <button
          follows="left|top"
          height="23"
-         label="Open attachment"
+         label="Open Attachment"
          layout="topleft"
-         right="-10"
+         left="5"
          name="open_attachment"
          top_pad="5"
-         width="135" />
+         width="180" />
         </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 6b3fb04549..a4249ce492 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="all"
- height="552"
+ height="680"
  label="Members &amp; Roles"
  layout="topleft"
  left="0"
  top="0"
  name="roles_tab"
- width="310">
+ width="313">
     <panel.string
      name="default_needs_apply_text">
-        There are unsaved changes to the current tab
+        There are unsaved changes
     </panel.string>
     <panel.string
      name="want_apply_text">
@@ -20,17 +20,18 @@
      name="help_text" />
     <tab_container
     border="false"
-     follows="left|top"
+     follows="left|top|right"
      height="552"
      halign="center"
      layout="topleft"
      left="0"
+     right="-1"
      name="roles_tab_container"
      tab_position="top"
-     tab_height="20"
-     tab_min_width="75"
+     tab_height="22"
+     tab_min_width="90"
      top="0"
-     width="310">
+     width="313">
         <panel
          border="false"
          follows="all"
@@ -38,11 +39,11 @@
          label="MEMBERS"
          layout="topleft"
          left="0"
+         right="-1"
          help_topic="roles_members_tab"
          name="members_sub_tab"
          tool_tip="Members"
-         class="panel_group_members_subtab"
-         width="310">
+         class="panel_group_members_subtab">
             <panel.string
              name="help_text">
                 You can add or remove Roles assigned to Members.
@@ -53,24 +54,23 @@ clicking on their names.
          layout="topleft"
          top="5"
          left="5"
-         width="280"
-         height="20"
-         follows="top"
-         max_length="250"
+         right="-5"
+         height="22"
+         search_button_visible="false"
+         follows="left|top|right"
          label="Filter Members"
          name="filter_input" />
             <name_list
-             column_padding="0"
+             column_padding="2"
              draw_heading="true"
-             heading_height="20"
              height="240"
-             follows="left|top"
+             follows="left|top|right"
              layout="topleft"
              left="0"
+             right="-1"
              multi_select="true"
              name="member_list"
-             top_pad="2"
-             width="300">
+             top_pad="5">
                 <name_list.columns
                  label="Member"
                  name="name"
@@ -82,33 +82,33 @@ clicking on their names.
                 <name_list.columns
                  label="Status"
                  name="online"
-         relative_width="0.15" />
+                 relative_width="0.14" />
             </name_list>
             <button
-             height="20"
-             follows="bottom|left"
+             height="23"
+             follows="top|left"
              label="Invite"
-             left="5"
+             left="0"
              name="member_invite"
              width="100" />
             <button
-             height="20"
+             height="23"
              label="Eject"
-             left_pad="5"
-             right="-5"
+             follows="top|left"
+             left_pad="10"
              name="member_eject"
              width="100" />
         </panel>
         <panel
          border="false"
-         height="230"
+         height="303"
          label="ROLES"
          layout="topleft"
          left="0"
+         right="-1"
          help_topic="roles_roles_tab"
          name="roles_sub_tab"
-         class="panel_group_roles_subtab"
-         width="310">
+         class="panel_group_roles_subtab">
            <!-- <button
              enabled="false"
              height="20"
@@ -145,22 +145,23 @@ including the Everyone and Owner Roles.
          layout="topleft"
          top="5"
          left="5"
-         width="280"
-         height="20"
+         right="-5"
+         height="22"
+         search_button_visible="false"
          follows="left|top|right"
-         max_length="250"
          label="Filter Roles"
          name="filter_input" />
             <scroll_list
              column_padding="0"
              draw_heading="true"
              draw_stripes="false"
-             follows="left|top"
-             heading_height="20"
-             height="170"
+             heading_height="23"
+             height="130"
              layout="topleft"
              search_column="1"
              left="0"
+             follows="left|top|right"
+             right="-1"
              name="role_list"
              top_pad="2"
              width="310">
@@ -178,28 +179,29 @@ including the Everyone and Owner Roles.
                relative_width="0.15"  />
             </scroll_list>
             <button
-            follows="bottom|left"
-             height="20"
+            follows="top|left"
+             height="23"
              label="New Role"
              layout="topleft"
-             left="5"
+             left="0"
              name="role_create"
-             width="100" />
+             width="120" />
             <button
-             height="20"
+             height="23"
+             follows="top|left"
              label="Delete Role"
              layout="topleft"
-             left_pad="5"
-             right="-5"
+             left_pad="10"
              name="role_delete"
-             width="100" />
+             width="120" />
         </panel>
         <panel
          border="false"
-         height="220"
+         height="303"
          label="ABILITIES"
          layout="topleft"
          left="0"
+         right="-1"
          help_topic="roles_actions_tab"
          name="actions_sub_tab"
          class="panel_group_actions_subtab"
@@ -226,13 +228,12 @@ things in this group. There&apos;s a broad variety of Abilities.
          layout="topleft"
          top="5"
          left="5"
-         width="280"
-         height="20"
+         right="-5"
+         height="22"
+         search_button_visible="false"
          follows="left|top|right"
-         max_length="250"
          label="Filter Abilities"
          name="filter_input" />
-
         <scroll_list
          column_padding="0"
          draw_stripes="true"
@@ -240,6 +241,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          follows="left|top"
          layout="topleft"
          left="0"
+         right="-1"
          name="action_list"
          search_column="2"
          tool_tip="Select an Ability to view more details"
@@ -261,35 +263,39 @@ things in this group. There&apos;s a broad variety of Abilities.
         </panel>
     </tab_container>
     <panel
-     height="252"
+     height="350"
+     background_visible="true"
+     bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
-     follows="left|top"
+     follows="top|left|right"
      left="0"
-     mouse_opaque="false" 
+     right="-1"
+     width="313"
+     mouse_opaque="false"
      name="members_footer"
-     top="300"
-     visible="false"
-     width="310">
+     top="325"
+     visible="false">
         <text
          type="string"
-         height="14"
+         height="16"
          layout="topleft"
          follows="left|top"
-         left="0"
+         left="5"
+         top="8"
+         text_color="EmphasisColor"
          name="static"
-         top_pad="5"
          width="300">
             Assigned Roles
         </text>
         <scroll_list
          draw_stripes="true"
-         follows="left|top"
-         height="90"
+        follows="left|top|right"
+         height="150"
          layout="topleft"
          left="0"
+         right="-1"
          name="member_assigned_roles"
-         top_pad="0"
-         width="300">
+         top_pad="0">
             <scroll_list.columns
              label=""
              name="checkbox"
@@ -299,27 +305,29 @@ things in this group. There&apos;s a broad variety of Abilities.
              name="role"
              width="270" />
         </scroll_list>
-                 <text
+          <text
          type="string"
-         height="14"
+         height="16"
          layout="topleft"
          follows="left|top"
-         left="0"
-         name="static2"
+         left="5"
          top_pad="5"
+         text_color="EmphasisColor"
+         name="static2"
          width="285">
             Allowed Abilities
         </text>
          <scroll_list
          draw_stripes="true"
-         height="90"
+             follows="left|top|right"
+         height="150"
          layout="topleft"
          left="0"
+         right="-1"
          name="member_allowed_actions"
          search_column="2"
          tool_tip="For details of each allowed ability see the abilities tab"
-         top_pad="0"
-         width="300">
+         top_pad="0">
             <scroll_list.columns
              label=""
              name="action"
@@ -327,30 +335,37 @@ things in this group. There&apos;s a broad variety of Abilities.
         </scroll_list>
     </panel>
     <panel
-     height="297"
+     height="550"
+     background_visible="true"
+     bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
+     follows="top|left|right"
      left="0"
+     right="-1"
+     width="313"
+     mouse_opaque="false"
      name="roles_footer"
      top_delta="0"
-     top="220"
-     visible="false"
-     width="310">
+     top="209"
+     visible="false">
         <text
          type="string"
-         height="14"
+         height="16"
          layout="topleft"
-         left="0"
+         follows="left|top"
+         left="5"
+         top="5"
          name="static"
-         top="0"
          width="300">
            Role Name
         </text>
         <line_editor
          type="string"
-         follows="left|top"
          height="20"
          layout="topleft"
          left="0"
+         follows="left|top|right"
+         right="-1"
          max_length="295"
          name="role_name"
          top_pad="0"
@@ -358,8 +373,10 @@ things in this group. There&apos;s a broad variety of Abilities.
         </line_editor>
         <text
          type="string"
-         height="14"
+         height="16"
          layout="topleft"
+         follows="left|top"
+         left="5"
          name="static3"
          top_pad="5"
          width="300">
@@ -367,19 +384,22 @@ things in this group. There&apos;s a broad variety of Abilities.
         </text>
         <line_editor
          type="string"
-         follows="left|top"
          height="20"
          layout="topleft"
+         left="0"
+         follows="left|top|right"
+         right="-1"
          max_length="295"
          name="role_title"
          top_pad="0"
          width="300">
         </line_editor>
-                <text
+               <text
          type="string"
-         height="14"
+         height="16"
          layout="topleft"
-         left="0"
+         follows="left|top"
+         left="5"
          name="static2"
          top_pad="5"
          width="200">
@@ -387,11 +407,12 @@ things in this group. There&apos;s a broad variety of Abilities.
         </text>
         <text_editor
          type="string"
-         halign="left"
-         height="35"
          layout="topleft"
          left="0"
+         follows="left|top|right"
+         right="-1"
          max_length="295"
+         height="35"
          name="role_description"
          top_pad="0"
          width="300"
@@ -399,10 +420,11 @@ things in this group. There&apos;s a broad variety of Abilities.
         </text_editor>
         <text
          type="string"
-         height="14"
+         height="16"
          layout="topleft"
          follows="left|top"
-         left="0"
+         left="5"
+         text_color="EmphasisColor"
          name="static4"
          top_pad="5"
          width="300">
@@ -410,15 +432,18 @@ things in this group. There&apos;s a broad variety of Abilities.
         </text>
         <name_list
          draw_stripes="true"
-         height="60"
+         height="128"
          layout="topleft"
          left="0"
+         follows="left|top|right"
+         right="-1"
          name="role_assigned_members"
          top_pad="0"
          width="300" />
         <check_box
          height="15"
          label="Reveal members"
+         left="5"
          layout="topleft"
          name="role_visible_in_list"
          tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group."
@@ -426,20 +451,23 @@ things in this group. There&apos;s a broad variety of Abilities.
          width="300" />
          <text
          type="string"
-         height="13"
+         height="16"
          layout="topleft"
          follows="left|top"
-         left="0"
+         left="5"
+         text_color="EmphasisColor"
          name="static5"
-         top_pad="5"
+         top_pad="2"
          width="300">
             Allowed Abilities
         </text>
         <scroll_list
          draw_stripes="true"
-         height="60"
+         height="140"
          layout="topleft"
          left="0"
+         follows="left|top|right"
+         right="-1"
          name="role_allowed_actions"
          search_column="2"
          tool_tip="For details of each allowed ability see the abilities tab"
@@ -447,10 +475,6 @@ things in this group. There&apos;s a broad variety of Abilities.
          width="300">
             <scroll_list.columns
              label=""
-             name="icon"
-             width="2" />
-            <scroll_list.columns
-             label=""
              name="checkbox"
              width="20" />
             <scroll_list.columns
@@ -460,14 +484,19 @@ things in this group. There&apos;s a broad variety of Abilities.
         </scroll_list>
     </panel>
    <panel
-     height="303"
+     height="424"
+     background_visible="true"
+     bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
+     follows="top|left|right"
      left="0"
+     right="-1"
+     width="313"
+     mouse_opaque="false"
      name="actions_footer"
      top_delta="0"
      top="255"
-     visible="false"
-     width="310">
+     visible="false">
         <text_editor
        bg_readonly_color="Transparent"
        text_readonly_color="EmphasisColor"
@@ -475,44 +504,54 @@ things in this group. There&apos;s a broad variety of Abilities.
          type="string"
          enabled="false"
          halign="left"
-         height="90"
          layout="topleft"
+         follows="left|top|right"
+         left="0"
+         right="-1"
+         height="90"
          max_length="512"
          name="action_description"
-         top_pad="0"
-         width="295"
+         top="0"
          word_wrap="true">
             This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
         </text_editor>
         <text
          type="string"
-         height="14"
+         height="16"
          layout="topleft"
+         follows="left|top"
          left="5"
          name="static2"
-         top_pad="5"
+         top_pad="1"
          width="300">
             Roles with this ability
         </text>
         <scroll_list
-         height="65"
+         height="172"
          layout="topleft"
+         follows="left|top|right"
          left="5"
+         right="-1"
          name="action_roles"
          top_pad="0"
          width="300" />
         <text
          type="string"
-         height="14"
+         height="16"
          layout="topleft"
+         follows="left|top"
+         left="5"
          name="static3"
          top_pad="5"
          width="300">
             Members with this ability
         </text>
         <name_list
-         height="100"
+         height="122"
+         follows="left|top|right"
          layout="topleft"
+         left="5"
+         right="-1"
          name="action_members"
          top_pad="0"
          width="300" />
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 3f836a661d..eb95de3a7c 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -91,7 +91,7 @@
         class="panel_group_info_sidetray"
         name="panel_group_info_sidetray"
         filename="panel_group_info_sidetray.xml"
-        label="Group Info"
+        label="Group Profile"
         font="SansSerifBold"
       />
       <panel