From 231572cfed6d178658bc3333eb97aff34746cb81 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 9 Aug 2014 20:34:55 -0700
Subject: DD-100 : Fixed! Had to create the inventory panels after we get the
 marketplace listings root id

---
 .../default/xui/en/panel_marketplace_listings.xml  | 92 ----------------------
 .../en/panel_marketplace_listings_inventory.xml    | 15 ++--
 .../xui/en/panel_marketplace_listings_listed.xml   | 24 ++++++
 .../en/panel_marketplace_listings_unassociated.xml | 23 ++++++
 .../xui/en/panel_marketplace_listings_unlisted.xml | 24 ++++++
 5 files changed, 78 insertions(+), 100 deletions(-)
 create mode 100755 indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
 create mode 100755 indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
 create mode 100755 indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
index 4a2d9f27e0..fd5c9ed422 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -74,98 +74,6 @@
     tab_group="1"
     tab_position="top"
     tab_min_width="50">
-    <inventory_panel
-      label="ALL"
-      name="All Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="370"
-      top="16"
-      left="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="false"
-      show_root_folder="true"
-      start_folder.type="merchant"
-      tool_tip="Drag and drop items here to sell them"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      show_item_link_overlays="true">
-      <item allow_wear="false"/>
-    </inventory_panel>
-    <inventory_panel
-      label="LISTED"
-      name="Active Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="370"
-      left_delta="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="false"
-      show_root_folder="true"
-      allow_drop_on_root="false"
-      start_folder.type="merchant"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      show_item_link_overlays="true">
-      <item allow_wear="false"/>
-    </inventory_panel>
-    <inventory_panel
-      label="UNLISTED"
-      name="Inactive Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="370"
-      left_delta="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="false"
-      show_root_folder="true"
-      allow_drop_on_root="false"
-      start_folder.type="merchant"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      show_item_link_overlays="true">
-      <item allow_wear="false"/>
-    </inventory_panel>
-    <inventory_panel
-      label="UNASSOCIATED"
-      name="Unassociated Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="370"
-      left_delta="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="false"
-      show_root_folder="true"
-      start_folder.type="merchant"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      show_item_link_overlays="true">
-      <item allow_wear="false"/>
-    </inventory_panel>
   </tab_container>
   </panel>
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
index 944a42d01c..dc2d4c27b6 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
@@ -3,24 +3,23 @@
     label="ALL"
     name="All Items"
     help_topic="marketplace_tab"
+    layout="topleft"
+    follows="all"
+    width="308"
+    height="370"
+    top="16"
+    left="0"
     start_folder.name="Marketplace listings"
     show_empty_message="false"
     show_load_status="false"
     show_root_folder="true"
     start_folder.type="merchant"
-    follows="all"
-    layout="topleft"
-    top="16"
-    left="0"
-    height="370"
-    width="308"
-    top_pad="0"
+    tool_tip="Drag and drop items here to sell them"
     bg_opaque_color="DkGray2"
     bg_alpha_color="DkGray2"
     background_visible="true"
     border="false"
     bevel_style="none"
-    tool_tip="Drag and drop items here to sell them"
     show_item_link_overlays="true">
     <item allow_wear="false"/>
 </inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
new file mode 100755
index 0000000000..211d21a063
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    label="LISTED"
+    name="Active Items"
+    help_topic="marketplace_tab"
+    layout="topleft"
+    follows="all"
+    width="308"
+    height="370"
+    left_delta="0"
+    start_folder.name="Marketplace listings"
+    show_empty_message="false"
+    show_load_status="false"
+    show_root_folder="true"
+    allow_drop_on_root="false"
+    start_folder.type="merchant"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true">
+    <item allow_wear="false"/>
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
new file mode 100755
index 0000000000..498e22ffbe
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    label="UNASSOCIATED"
+    name="Unassociated Items"
+    help_topic="marketplace_tab"
+    layout="topleft"
+    follows="all"
+    width="308"
+    height="370"
+    left_delta="0"
+    start_folder.name="Marketplace listings"
+    show_empty_message="false"
+    show_load_status="false"
+    show_root_folder="true"
+    start_folder.type="merchant"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true">
+    <item allow_wear="false"/>
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
new file mode 100755
index 0000000000..aad7e836e4
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    label="UNLISTED"
+    name="Inactive Items"
+    help_topic="marketplace_tab"
+    layout="topleft"
+    follows="all"
+    width="308"
+    height="370"
+    left_delta="0"
+    start_folder.name="Marketplace listings"
+    show_empty_message="false"
+    show_load_status="false"
+    show_root_folder="true"
+    allow_drop_on_root="false"
+    start_folder.type="merchant"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true">
+    <item allow_wear="false"/>
+</inventory_panel>
-- 
cgit v1.2.3