2 files changed, 74 insertions, 20 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
new file mode 100644
index 0000000000..01c7ae61d2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ bg_alpha_color="DkGray"
+ border="false"
+ bottom="0"
+ follows="all"
+ height="200"
+ left="0"
+ name="cof_wearables"
+ width="313">
+    <accordion
+     follows="all"
+     height="373"
+     layout="topleft"
+     left="3"
+     top="0"
+     name="cof_wearables_accordion"
+     background_visible="true"
+     bg_alpha_color="DkGray2"
+     width="307">
+        <accordion_tab
+         layout="topleft"
+         name="tab_attachments"
+         title="Attachments">
+            <flat_list_view
+             allow_select="true"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="list_attachments"
+             top="0"
+             width="307" />
+        </accordion_tab>
+        <accordion_tab
+         layout="topleft"
+         name="tab_clothing"
+         title="Clothing">
+            <flat_list_view
+             allow_select="true"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="list_clothing"
+             top="0"
+             width="307" />
+        </accordion_tab>
+        <accordion_tab
+         layout="topleft"
+         name="tab_body_parts"
+         title="Body Parts">
+            <flat_list_view
+             allow_select="true"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="list_body_parts"
+             top="0"
+             width="307" />
+        </accordion_tab>
+    </accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 314d2389ae..73181392c9 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -149,29 +149,18 @@
          auto_resize="true"
          user_resize="true">
 
-            <scroll_list
-             width="300"
-             column_padding="0"
-             draw_heading="false"
-             draw_stripes="false"
+            <!-- List containing items from the COF and Base outfit -->
+            <panel
+             background_visible="false"
+             class="cof_wearables"
+             filename="panel_cof_wearables.xml"
              follows="left|top|right|bottom"
+             height="193"
              layout="topleft"
-             name="look_items_list"
-             search_column="1"
-             sort_column="2"
              left="0"
-             height="193"
-             top="0">
-                <scroll_list.columns
-                 label="Look Item"
-                 name="look_item"
-                 width="285" />
-                <scroll_list.columns
-                 label="Outfit Item Sort"
-                 width="0"
-                 sort_column="look_item_sort"
-                 name="look_item_sort" />
-            </scroll_list>
+             name="cof_wearables_list"
+             top="0"
+             width="300" /> 
 
           <panel
              background_visible="true"