fix for major bug EXT-2219 New Group profile layout breaks...everything

lots of small problems...

--HG--
branch : product-engine

6 files changed, 74 insertions, 153 deletions

diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 88aad4923d..7b5b232ad2 100644
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -2383,12 +2383,8 @@ BOOL LLPanelGroupActionsSubTab::postBuildSubTab(LLView* root)
 void LLPanelGroupActionsSubTab::activate()
 {
 	LLPanelGroupSubTab::activate();
-	lldebugs << "LLPanelGroupActionsSubTab::activate()" << llendl;
 
-	mActionList->deselectAllItems();
-	mActionMembers->deleteAllItems();
-	mActionRoles->deleteAllItems();
-	mActionDescription->clear();
+	update(GC_ALL);
 }
 
 void LLPanelGroupActionsSubTab::deactivate()
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 4f24c7a745..58a78a0ab8 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -8,7 +8,7 @@
  left="0"
  top="0"
  name="general_tab"
- width="303">
+ width="310">
     <panel.string
      name="help_text">
         The General tab contains general information about this group, a list of members, general Group Preferences and member options.
@@ -32,7 +32,7 @@ Hover your mouse over the options for more help.
      max_length="511"
      name="charter"
      top="5"
-     width="303"
+     width="305"
      word_wrap="true">
      Group Charter
     </text_editor>
@@ -43,10 +43,10 @@ Hover your mouse over the options for more help.
      heading_height="16"
      height="130"
      layout="topleft"
-     left_delta="0"
+     left="5"
      name="visible_members"
-     top_pad="0"
-     width="303">
+     top_pad="2"
+     width="305">
         <name_list.columns
          label="Member"
          name="name"
@@ -64,7 +64,7 @@ Hover your mouse over the options for more help.
          left_delta="0"
          name="active_title_label"
          top_pad="5"
-         width="303">
+         width="300">
             My Title
         </text>
         <combo_box
@@ -75,7 +75,7 @@ Hover your mouse over the options for more help.
          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"
-         width="303" />
+         width="305" />
         <check_box
          height="16"
          font="SansSerifSmall"
@@ -85,7 +85,7 @@ Hover your mouse over the options for more help.
          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"
-         width="303" />
+         width="300" />
         <check_box
          height="16"
          label="Show in my profile"
@@ -94,7 +94,7 @@ Hover your mouse over the options for more help.
          name="list_groups_in_profile"
          tool_tip="Sets whether you want to show this group in your profile"
          top_pad="5"
-         width="303" />
+         width="295" />
         <panel
          background_visible="true"
          bevel_style="in"
@@ -106,7 +106,7 @@ Hover your mouse over the options for more help.
          left="5"
          name="preferences_container"
          top_pad="5"
-         width="303">
+         width="305">
         <check_box
          follows="right|top"
          height="16"
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 de1323d9cb..0082128ca4 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
@@ -9,7 +9,7 @@ background_visible="true"
  left="0"
  top="20"
  name="GroupInfo"
- width="333">
+ width="323">
     <panel.string
      name="default_needs_apply_text">
         There are unsaved changes to the current tab
@@ -117,28 +117,17 @@ background_visible="true"
      width="120" />
    <accordion
              follows="all"
-             height="425"
+             height="405"
              layout="topleft"
              left="0"
              name="groups_accordion"
              top_pad="15"
-             width="336">
+             width="323">
              <accordion_tab
                  expanded="true"
                  layout="topleft"
                  name="group_general_tab"
                  title="General">
-         <scroll_container
-         color="DkGray2"
-         opaque="true"
-         height="323"
-         follows="all"
-         layout="topleft"
-         left="0"
-         top="0"
-         name="general_scroll"
-         reserve_scroll_corner="false"
-         width="333">
             <panel
             border="false"
          class="panel_group_general" 
@@ -146,27 +135,15 @@ background_visible="true"
              layout="topleft"
              left="0"
              help_topic="group_general_tab"
-         name="group_general_tab_panel"
+             name="group_general_tab_panel"
              top="0"
-             width="303" />
-         </scroll_container>
+             width="300" />
          </accordion_tab>
          <accordion_tab
                  expanded="false"
                  layout="topleft"
                  name="group_roles_tab"
                  title="Roles">
-               <scroll_container
-                  color="DkGray2"
-                  opaque="true"
-                  height="323"
-                  follows="all"
-                  layout="topleft"
-                  left="0"
-                  top="0"
-                  name="roles_scroll"
-                  reserve_scroll_corner="false"
-                  width="333">
                  <panel
                  border="false"
          class="panel_group_roles"
@@ -177,24 +154,12 @@ background_visible="true"
          name="group_roles_tab_panel"
                   top="0"
              width="303" />
-         </scroll_container>
          </accordion_tab>
          <accordion_tab
                  expanded="false"
                  layout="topleft"
                  name="group_notices_tab"
                  title="Notices">
-            <scroll_container
-                  color="DkGray2"
-                  opaque="true"
-                  height="323"
-                  follows="all"
-                  layout="topleft"
-                  left="0"
-                  top="0"
-                  name="notices_scroll"
-                  reserve_scroll_corner="false"
-                  width="333">
         <panel
         border="false"
          class="panel_group_notices"
@@ -205,24 +170,12 @@ background_visible="true"
          name="group_notices_tab_panel"
          top="0"
          width="303" />
-         </scroll_container>
          </accordion_tab>
         <accordion_tab
                  expanded="false"
                  layout="topleft"
                  name="group_land_tab"
                  title="Land/Assets">
-           <scroll_container
-                  color="DkGray2"
-                  opaque="true"
-                  height="323"
-                  follows="all"
-                  layout="topleft"
-                  left="0"
-                  top="0"
-                  name="land_scroll"
-                  reserve_scroll_corner="false"
-                  width="333">
         <panel
         border="false"
          class="panel_group_land_money"
@@ -232,8 +185,7 @@ background_visible="true"
          help_topic="group_land_money_tab"
          name="group_land_tab_panel"
          top="0"
-         width="313" />
-         </scroll_container>
+         width="300" />
          </accordion_tab>
          </accordion>
    <button
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 0c6f81f8fd..2c649642c3 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
@@ -5,10 +5,10 @@
  height="510"
  label="Land &amp; L$"
  layout="topleft"
- left="1"
+ left="0"
  name="land_money_tab"
  top="0"
- width="313">
+ width="310">
     <panel.string
      name="help_text">
         Parcels owned by a group are listed along with contribution details. A warning appears until the Total Land in Use is less than or = to the Total Contribution.
@@ -47,10 +47,10 @@
      heading_height="20"
      height="150"
      layout="topleft"
-     left="0"
+     left="2"
      name="group_parcel_list"
      top_pad="0"
-     width="313">
+     width="305">
         <scroll_list.columns
          label="Parcel"
          name="name"
@@ -79,7 +79,7 @@
      label_selected="Map"
      layout="topleft"
      name="map_button"
-     right="-10"
+     right="-5"
      top_pad="5"
      width="95"
      enabled="false" />
@@ -185,7 +185,9 @@
      layout="topleft"
      left_pad="3"
      name="your_contribution_units"
-     top_delta="2">
+     top_delta="2"
+     width="40"
+      >
         m²
     </text>
      <text
@@ -210,17 +212,17 @@
      visible="false"
      width="16" />
     <text
-      follows="left|top"
+     follows="left|top"
      type="string"
      word_wrap="true"
      font="SansSerifSmall"
      height="35"
      layout="topleft"
-     left_pad="0"
+     left_pad="5"
      name="group_over_limit_text"
      text_color="EmphasisColor"
      top_delta="0"
-     width="290">
+     width="260">
         Group members must contribute more land credits to support land in use
     </text>
     <text
@@ -241,7 +243,7 @@
      height="200"
      halign="center"
      layout="topleft"
-     left="10"
+     left="5"
      name="group_money_tab_container"
      tab_position="top"
      tab_height="20"
@@ -268,7 +270,7 @@
              left="0"
              max_length="4096"
              name="group_money_planning_text"
-             top="0"
+             top="2"
              width="300"
              word_wrap="true">
                 Loading...
@@ -293,7 +295,7 @@
              left="0"
              max_length="4096"
              name="group_money_details_text"
-             top="0"
+             top="2"
              width="300"
              word_wrap="true">
                 Loading...
@@ -305,8 +307,8 @@
 	     layout="topleft"
 	     name="earlier_details_button"
 	     tool_tip="Back"
-	     top_pad="3"
-             right="-35"
+	     top_pad="5"
+             right="-45"
 	     width="31" />
              <button
 	     follows="left|top"
@@ -327,7 +329,7 @@
          left_delta="0"
          help_topic="group_money_sales_tab"
          name="group_money_sales_tab"
-         top_delta="-1"
+         top="5"
          width="300">
             <text_editor
              type="string"
@@ -337,7 +339,7 @@
              left="0"
              max_length="4096"
              name="group_money_sales_text"
-             top="0"
+             top="2"
              width="300"
              word_wrap="true">
                 Loading...
@@ -349,8 +351,8 @@
 	     layout="topleft"
 	     name="earlier_sales_button"
 	     tool_tip="Back"
-	     top_pad="3"
-             right="-35"
+	     top_pad="5"
+         right="-45"
 	     width="31" />
              <button
 	     follows="left|top"
@@ -358,7 +360,7 @@
 	     image_overlay="Arrow_Right_Off"
 	     layout="topleft"
 	     left_pad="10"
-             name="later_sales_button"
+         name="later_sales_button"
 	     tool_tip="Next"
 	     width="31" />
         </panel>
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 24a4005a45..e56db6414f 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -7,7 +7,7 @@
  left="0"
  name="notices_tab"
  top="0"
- width="313">
+ width="310">
     <panel.string
      name="help_text">
         Notices are a quick way to communicate across a 
@@ -27,7 +27,7 @@ the General tab.
      word_wrap="true"
      height="30"
      layout="topleft"
-     left="10"
+     left="5"
      name="lbl2"
      top="5"
      width="300">
@@ -41,10 +41,10 @@ Groups are limited to 200 notices/group daily
      heading_height="16"
      height="125"
      layout="topleft"
-     left="0"
+     left="2"
      name="notice_list"
      top_pad="0"
-     width="303">
+     width="305">
         <scroll_list.columns
          label=""
          name="icon"
@@ -81,10 +81,10 @@ Groups are limited to 200 notices/group daily
        image_disabled="AddItem_Disabled"
        layout="topleft"
        label="Create a new notice"
-       left="15"
+       left="5"
        name="create_new_notice"
        tool_tip="Create a new notice"
-     top_delta="-5"
+     top_delta="0"
        width="18" />
      <button
      follows="top|left"
@@ -93,7 +93,7 @@ Groups are limited to 200 notices/group daily
      layout="topleft"
      name="refresh_notices"
      right="-5"
-     top_delta="5"
+     top_delta="0"
      width="23" />
     <panel
      follows="left|top"
@@ -219,7 +219,7 @@ Groups are limited to 200 notices/group daily
          label_selected="Send Notice"
          layout="topleft"
          right="-10"
-         top_pad="20"
+         top_pad="10"
          name="send_notice"
          width="100" />
       <group_drop_target
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 4129d7b448..604fb81c8e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -7,7 +7,7 @@
  left="0"
  top="0"
  name="roles_tab"
- width="313">
+ width="310">
     <panel.string
      name="default_needs_apply_text">
         There are unsaved changes to the current tab
@@ -28,9 +28,9 @@
      name="roles_tab_container"
      tab_position="top"
      tab_height="20"
-     tab_min_width="96"
+     tab_min_width="75"
      top="3"
-     width="303">
+     width="300">
         <panel
          border="false"
          height="220"
@@ -51,23 +51,13 @@ clicking on their names.
          <filter_editor
          layout="topleft"
          top="10"
-         left="4"
+         left="5"
          width="280"
          height="20"
          follows="left|top|right"
          max_length="250"
          label="Filter Members"
          name="filter_input" />
-          <!--  <button
-             enabled="false"
-             font="SansSerifSmall"
-             height="20"
-             label="Show All"
-             layout="topleft"
-             left_pad="-90"
-             name="show_all_button"
-             top_delta="-6"
-             width="80" />-->
             <name_list
              column_padding="0"
              draw_heading="true"
@@ -111,14 +101,6 @@ clicking on their names.
              right="-5"
              name="member_eject"
              width="100" />
-             <!--What is this?-->
-            <icon
-             height="16"
-             image_name="Inv_FolderClosed"
-             layout="topleft"
-             name="power_folder_icon"
-             visible="false"
-             width="16" />
         </panel>
         <panel
          border="false"
@@ -156,7 +138,7 @@ including the Everyone and Owner Roles.
          <filter_editor
          layout="topleft"
          top="10"
-         left="4"
+         left="5"
          width="280"
          height="20"
          follows="left|top|right"
@@ -179,12 +161,12 @@ including the Everyone and Owner Roles.
              draw_stripes="false"
              follows="left|top"
              heading_height="20"
-             height="150"
+             height="160"
              layout="topleft"
              search_column="1"
              left="0"
              name="role_list"
-             top_pad="4"
+             top_pad="2"
              width="300">
                 <scroll_list.columns
                  label="Role"
@@ -238,24 +220,13 @@ things in this group. There&apos;s a broad variety of Abilities.
          <filter_editor
          layout="topleft"
          top="10"
-         left="4"
+         left="5"
          width="280"
          height="20"
          follows="left|top|right"
          max_length="250"
          label="Filter Abilities"
          name="filter_input" />
-            <!--
-            <button
-             enabled="false"
-             font="SansSerifSmall"
-             height="20"
-             label="Show All"
-             layout="topleft"
-             left_pad="0"
-             name="show_all_button"
-             top_delta="0"
-             width="80" /> -->
             <scroll_list
              column_padding="0"
              draw_stripes="false"
@@ -267,14 +238,14 @@ things in this group. There&apos;s a broad variety of Abilities.
              name="action_list"
              search_column="1"
              tool_tip="Select an Ability to view more details"
-             top_pad="6"
+             top_pad="2"
              width="300">
                 <scroll_list.columns
                  label=""
                  name="icon"
                  width="16" />
                 <scroll_list.columns
-                 label=""
+                 label="Action"
                  name="action"
                  width="247" />
             </scroll_list>
@@ -293,9 +264,9 @@ things in this group. There&apos;s a broad variety of Abilities.
      follows="left|top"
      left="10"
      name="members_footer"
-     top_pad="10"
+     top="245"
      top_delta="0"
-     width="300">
+     width="290">
         <text
          type="string"
          height="16"
@@ -304,7 +275,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          left="0"
          name="static"
          top_pad="5"
-         width="295">
+         width="285">
             Assigned Roles
         </text>
         <scroll_list
@@ -315,7 +286,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          left="0"
          name="member_assigned_roles"
          top_pad="0"
-         width="295">
+         width="285">
             <scroll_list.columns
              label=""
              name="checkbox"
@@ -323,7 +294,7 @@ things in this group. There&apos;s a broad variety of Abilities.
             <scroll_list.columns
              label=""
              name="role"
-             width="265" />
+             width="255" />
         </scroll_list>
                  <text
          type="string"
@@ -333,7 +304,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          left="0"
          name="static2"
          top_pad="5"
-         width="295">
+         width="285">
             Allowed Abilities
         </text>
          <scroll_list
@@ -345,7 +316,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          search_column="2"
          tool_tip="For details of each allowed ability see the abilities tab"
          top_pad="0"
-         width="295">
+         width="285">
             <scroll_list.columns
              label=""
              name="icon"
@@ -353,7 +324,7 @@ things in this group. There&apos;s a broad variety of Abilities.
             <scroll_list.columns
              label=""
              name="action"
-             width="275" />
+             width="265" />
         </scroll_list>
     </panel>
     <panel
@@ -364,7 +335,7 @@ things in this group. There&apos;s a broad variety of Abilities.
      top_delta="0"
      top="245"
      visible="false"
-     width="300">
+     width="290">
         <text
          type="string"
          height="16"
@@ -386,7 +357,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          max_length="295"
          name="role_name"
          top_pad="0"
-         width="295">
+         width="290">
             Employees
         </line_editor>
         <text
@@ -395,7 +366,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          layout="topleft"
          name="static3"
          top_pad="5"
-         width="295">
+         width="290">
             Title
         </text>
         <line_editor
@@ -408,7 +379,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          max_length="295"
          name="role_title"
          top_pad="0"
-         width="295">
+         width="290">
           (waiting)
         </line_editor>
                 <text
@@ -442,7 +413,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          left="0"
          name="static4"
          top_pad="5"
-         width="295">
+         width="290">
             Assigned Roles
         </text>
         <name_list
@@ -452,7 +423,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          left="0"
          name="role_assigned_members"
          top_pad="0"
-         width="295" />
+         width="290" />
         <check_box
          height="15"
          label="Reveal members"
@@ -469,7 +440,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          left="0"
          name="static5"
          top_pad="5"
-         width="295">
+         width="290">
             Allowed Abilities
         </text>
         <scroll_list
@@ -504,7 +475,7 @@ things in this group. There&apos;s a broad variety of Abilities.
      top_delta="0"
      top="245"
      visible="false"
-     width="300">
+     width="290">
         <text
          type="string"
          height="16"
@@ -550,7 +521,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          layout="topleft"
          name="static3"
          top_pad="5"
-         width="295">
+         width="290">
             Members with this ability
         </text>
         <name_list
@@ -558,6 +529,6 @@ things in this group. There&apos;s a broad variety of Abilities.
          layout="topleft"
          name="action_members"
          top_pad="0"
-         width="295" />
+         width="290" />
     </panel>
 </panel>