DD-16 : WIP : Fix filtering on menu and tabs. Sort still not done

indra/newview/llinventoryfilter.cpp

@@ -33,6 +33,7 @@
 #include "llfolderviewitem.h"
 #include "llinventorymodel.h"
 #include "llinventorymodelbackgroundfetch.h"
+#include "llinventoryfunctions.h"
 #include "llmarketplacefunctions.h"
 #include "llviewercontrol.h"
 #include "llfolderview.h"
@@ -133,29 +134,34 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const
 	}
 
 	// Marketplace folder filtering
-	const U32 filterTypes = mFilterOps.mFilterTypes;
-	if (filterTypes & FILTERTYPE_MARKETPLACE_ACTIVE)
-	{
-        if (!LLMarketplaceData::instance().getActivationState(folder_id))
+    S32 depth = depth_nesting_in_marketplace(folder_id);
+    if (depth > 0)
+    {
+        const U32 filterTypes = mFilterOps.mFilterTypes;
+        LLUUID listing_uuid = nested_parent_id(folder_id, depth);
+        if (filterTypes & FILTERTYPE_MARKETPLACE_ACTIVE)
         {
-            return false;
+            if (!LLMarketplaceData::instance().getActivationState(listing_uuid))
+            {
+                return false;
+            }
         }
-	}
-	if (filterTypes & FILTERTYPE_MARKETPLACE_INACTIVE)
-	{
-        if (LLMarketplaceData::instance().getActivationState(folder_id))
+        else if (filterTypes & FILTERTYPE_MARKETPLACE_INACTIVE)
         {
-            return false;
+            if (!LLMarketplaceData::instance().isListed(listing_uuid) || LLMarketplaceData::instance().getActivationState(listing_uuid))
+            {
+                return false;
+            }
         }
-	}
-	if (filterTypes & FILTERTYPE_MARKETPLACE_UNASSOCIATED)
-	{
-        if (!LLMarketplaceData::instance().getListingID(folder_id).empty())
+        else if (filterTypes & FILTERTYPE_MARKETPLACE_UNASSOCIATED)
         {
-            return false;
+            if (LLMarketplaceData::instance().isListed(listing_uuid))
+            {
+                return false;
+            }
         }
 	}
-	
+    
 	// Always check against the clipboard
 	const BOOL passed_clipboard = checkAgainstClipboard(folder_id);
 	

indra/newview/skins/default/xui/en/menu_marketplace_view.xml

@@ -30,7 +30,7 @@
         function="Marketplace.ViewSort.CheckItem"
         parameter="show_unassociated" />
     </menu_item_check>
-    <menu_item_check name="show_active" label="Show Active Listings and Folders Only">
+    <menu_item_check name="show_active" label="Show Active Listings Only">
         <menu_item_check.on_click
         function="Marketplace.ViewSort.Action"
         parameter="show_active" />