From f813a25224081e68d4772676909d2cff14407486 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 25 Mar 2014 10:22:10 -0700
Subject: DD-10 : WIP : Some XUI clean up, menu still not working

---
 indra/newview/llfloateroutbox.cpp                  |   2 +-
 .../skins/default/xui/en/menu_marketplace_view.xml |   4 +-
 .../default/xui/en/panel_marketplace_listings.xml  | 138 +++++++++++++++++++++
 .../en/panel_marketplace_listings_inventory.xml    | 138 ---------------------
 4 files changed, 141 insertions(+), 141 deletions(-)
 create mode 100755 indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
 delete mode 100755 indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml

(limited to 'indra')

diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp
index 0d87cf63e8..9ea83e9621 100755
--- a/indra/newview/llfloateroutbox.cpp
+++ b/indra/newview/llfloateroutbox.cpp
@@ -900,7 +900,7 @@ void LLFloaterMarketplaceListings::setup()
 	llassert(mCategoriesObserver);
 	
 	// Set up the marketplace listings inventory view
-    LLPanel* inventory_panel = LLUICtrlFactory::createFromFile<LLPanel>("panel_marketplace_listings_inventory.xml", mInventoryPlaceholder->getParent(), LLInventoryPanel::child_registry_t::instance());
+    LLPanel* inventory_panel = LLUICtrlFactory::createFromFile<LLPanel>("panel_marketplace_listings.xml", mInventoryPlaceholder->getParent(), LLInventoryPanel::child_registry_t::instance());
 	LLInventoryPanel* items_panel = inventory_panel->getChild<LLInventoryPanel>("All Items");
     mInventoryPanel = items_panel->getInventoryPanelHandle();
 	llassert(mInventoryPanel.get() != NULL);
diff --git a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
index 36c73b9f4b..9ed93e2f11 100755
--- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
@@ -32,10 +32,10 @@
     </menu_item_check>
     <menu_item_check name="show_active" label="Show Active Listings and Folders Only">
         <menu_item_check.on_click
-        function="People.Nearby.ViewSort.Action"
+        function="Marketplace.ViewSort.Action"
         parameter="show_active" />
         <menu_item_check.on_check
-        function="People.Nearby.ViewSort.CheckItem"
+        function="Marketplace.ViewSort.CheckItem"
         parameter="show_active" />
     </menu_item_check>
     <menu_item_check name="show_inactive_listings" label="Show Inactive Listings Only">
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
new file mode 100755
index 0000000000..54fc3a0c0f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+  label="Marketplace"
+  name="main marketplace panel"
+  follows="all"
+  layout="topleft"
+  width="308"
+  height="375">
+  <panel
+    label="tool_panel"
+    name="nearby_buttons_panel"
+    follows="left|top|right"
+    layout="topleft"
+    height="30"
+    width="308"
+    top="0"
+    left="0">
+    <menu_button
+      name="sort_btn"
+      tool_tip="View/sort options"
+      layout="topleft"
+      follows="top|left"
+      width="31"
+      height="25"
+      left="2"
+      menu_filename="menu_marketplace_view.xml"
+      image_hover_unselected="Toolbar_Middle_Over"
+      image_overlay="Conv_toolbar_sort"
+      image_selected="Toolbar_Middle_Selected"
+      image_unselected="Toolbar_Middle_Off"
+      menu_position="bottomleft"/>
+  </panel>
+  <panel
+    follows="all"
+    layout="topleft"
+    default_tab_group="1"
+    width="308"
+    height="340">
+  <tab_container
+    name="marketplace filter tabs"
+    follows="all"
+    layout="topleft"
+    top="0"
+    left="0"
+    top_pad="0"
+    width="308"
+    height="340"
+    halign="center"
+    tab_height="30"
+    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="310"
+      top="16"
+      left="0"
+      start_folder.name="Marketplace listings"
+      show_empty_message="false"
+      show_load_status="false"
+      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"
+      sort_order_setting="InventorySortOrder"
+      show_item_link_overlays="true">
+    </inventory_panel>
+    <inventory_panel
+      label="ACTIVE"
+      name="Active Items"
+      help_topic="marketplace_tab"
+      layout="topleft"
+      follows="all"
+      width="308"
+      height="310"
+      left_delta="0"
+      start_folder.name="Marketplace listings"
+      show_empty_message="false"
+      show_load_status="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">
+    </inventory_panel>
+    <inventory_panel
+      label="INACTIVE"
+      name="Inactive Items"
+      help_topic="marketplace_tab"
+      layout="topleft"
+      follows="all"
+      width="308"
+      height="310"
+      left_delta="0"
+      start_folder.name="Marketplace listings"
+      show_empty_message="false"
+      show_load_status="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">
+    </inventory_panel>
+    <inventory_panel
+      label="UNASSOCIATED"
+      name="Unassociated Items"
+      help_topic="marketplace_tab"
+      layout="topleft"
+      follows="all"
+      width="308"
+      height="310"
+      left_delta="0"
+      start_folder.name="Marketplace listings"
+      show_empty_message="false"
+      show_load_status="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">
+    </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
deleted file mode 100755
index 54fc3a0c0f..0000000000
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-  label="Marketplace"
-  name="main marketplace panel"
-  follows="all"
-  layout="topleft"
-  width="308"
-  height="375">
-  <panel
-    label="tool_panel"
-    name="nearby_buttons_panel"
-    follows="left|top|right"
-    layout="topleft"
-    height="30"
-    width="308"
-    top="0"
-    left="0">
-    <menu_button
-      name="sort_btn"
-      tool_tip="View/sort options"
-      layout="topleft"
-      follows="top|left"
-      width="31"
-      height="25"
-      left="2"
-      menu_filename="menu_marketplace_view.xml"
-      image_hover_unselected="Toolbar_Middle_Over"
-      image_overlay="Conv_toolbar_sort"
-      image_selected="Toolbar_Middle_Selected"
-      image_unselected="Toolbar_Middle_Off"
-      menu_position="bottomleft"/>
-  </panel>
-  <panel
-    follows="all"
-    layout="topleft"
-    default_tab_group="1"
-    width="308"
-    height="340">
-  <tab_container
-    name="marketplace filter tabs"
-    follows="all"
-    layout="topleft"
-    top="0"
-    left="0"
-    top_pad="0"
-    width="308"
-    height="340"
-    halign="center"
-    tab_height="30"
-    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="310"
-      top="16"
-      left="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="false"
-      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"
-      sort_order_setting="InventorySortOrder"
-      show_item_link_overlays="true">
-    </inventory_panel>
-    <inventory_panel
-      label="ACTIVE"
-      name="Active Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="310"
-      left_delta="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="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">
-    </inventory_panel>
-    <inventory_panel
-      label="INACTIVE"
-      name="Inactive Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="310"
-      left_delta="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="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">
-    </inventory_panel>
-    <inventory_panel
-      label="UNASSOCIATED"
-      name="Unassociated Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="310"
-      left_delta="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="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">
-    </inventory_panel>
-  </tab_container>
-  </panel>
-</panel>
\ No newline at end of file
-- 
cgit v1.2.3