1 files changed, 13 insertions, 54 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index cf84c31078..5f34c24bca 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -9,6 +9,7 @@
  name="cof_wearables"
  width="311">
     <accordion
+     fit_parent="true"
      follows="all"
      height="200"
      layout="topleft"
@@ -38,73 +39,31 @@
          layout="topleft"
          name="tab_clothing"
          title="Clothing">
-            
-            <!-- *NOTE there should be no any gaps between the button bar and the list - 
-            accordiong-list adaptor won't employ them while calculating new height when the size of the list changes -->
-            <panel
-             background_visible="false"
-             class="accordion_list_adaptor"
+            <flat_list_view
+             allow_select="true"
              follows="all"
-             height="45"
+             height="10"
              layout="topleft"
              left="0"
-             name="button_bar_adaptor"
+             multi_select="true"
+             name="list_clothing"
              top="0"
-             width="311">
-                <panel
-                 bevel="none"
-                 filename="panel_clothing_list_button_bar.xml"
-                 height="35"
-                 name="button_bar"
-                 top="0"
-                 width="311" />
-                <flat_list_view
-                 allow_select="true"
-                 follows="all"
-                 height="10"
-                 layout="topleft"
-                 left="0"
-                 multi_select="true"
-                 name="list_clothing"
-                 top_pad="0"
-                 width="311" />
-            </panel>
+             width="311" />
         </accordion_tab>
         <accordion_tab
          layout="topleft"
          name="tab_body_parts"
          title="Body Parts">
-
-            <!-- *NOTE there should be no any gaps between the button bar and the list - 
-            accordiong-list adaptor won't employ them while calculating new height when the size of the list changes -->
-            <panel
-             background_visible="false"
-             class="accordion_list_adaptor"
+            <flat_list_view
+             allow_select="true"
              follows="all"
-             height="45"
+             height="10"
              layout="topleft"
              left="0"
-             name="button_bar_adaptor"
+             multi_select="true"
+             name="list_body_parts"
              top="0"
-             width="311">
-                <panel 
-                 bevel="none"
-                 filename="panel_bodyparts_list_button_bar.xml" 
-                 height="35"
-                 name="button_bar"
-                 top="0"
-                 width="311"/>
-                <flat_list_view
-                 allow_select="true"
-                 follows="all"
-                 height="10"
-                 layout="topleft"
-                 left="0"
-                 multi_select="true"
-                 name="list_body_parts"
-                 top_pad="0"
-                 width="311" />
-            </panel>
+             width="311" />
         </accordion_tab>
     </accordion>
 </panel>