From 48b6a713be449f39b33b3de190b3caccd5ad55a2 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 26 Mar 2014 10:55:42 -0700
Subject: DD-10 : Make the filter tool works in All tab and finished refactor

---
 .../skins/default/xui/en/floater_marketplace_listings.xml    |  8 +++++++-
 indra/newview/skins/default/xui/en/menu_marketplace_view.xml | 12 ++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
index 80d6187e1e..0f511c4a66 100755
--- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
@@ -64,7 +64,13 @@
           wrap="true"
           halign="left" />
       </panel>
-    </panel>
+      <panel
+        name="panel_marketplace_listing"
+        filename="panel_marketplace_listings.xml"
+        class="llpanelmarketplacelistings"
+        top="0"
+        follows="all"/>
+      </panel>
     <panel
       follows="bottom|left|right"
       layout="topleft"
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 9ed93e2f11..4043c5c93d 100755
--- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
@@ -22,13 +22,13 @@
         function="Marketplace.ViewSort.CheckItem"
         parameter="show_all" />
     </menu_item_check>
-    <menu_item_check name="show_associated_listings" label="Show Associated Listings Only">
+    <menu_item_check name="show_unassociated" label="Show Unassociated Listings Only">
         <menu_item_check.on_click
         function="Marketplace.ViewSort.Action"
-        parameter="show_associated_listings" />
+        parameter="show_unassociated" />
         <menu_item_check.on_check
         function="Marketplace.ViewSort.CheckItem"
-        parameter="show_associated_listings" />
+        parameter="show_unassociated" />
     </menu_item_check>
     <menu_item_check name="show_active" label="Show Active Listings and Folders Only">
         <menu_item_check.on_click
@@ -38,12 +38,12 @@
         function="Marketplace.ViewSort.CheckItem"
         parameter="show_active" />
     </menu_item_check>
-    <menu_item_check name="show_inactive_listings" label="Show Inactive Listings Only">
+    <menu_item_check name="show_inactive" label="Show Inactive Listings Only">
         <menu_item_check.on_click
         function="Marketplace.ViewSort.Action"
-        parameter="show_inactive_listings" />
+        parameter="show_inactive" />
         <menu_item_check.on_check
         function="Marketplace.ViewSort.CheckItem"
-        parameter="show_inactive_listings" />
+        parameter="show_inactive" />
     </menu_item_check>
 </toggleable_menu>
-- 
cgit v1.2.3