DD-63 : Suppress the filtering options in the marketplace option submenu. Redundants with tabs

2 files changed, 0 insertions, 65 deletions

diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index 59e3e8442e..869b911310 100755
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -117,30 +117,6 @@ void LLPanelMarketplaceListings::onViewSortMenuItemClicked(const LLSD& userdata)
         mSortOrder = (mSortOrder == LLInventoryFilter::SO_FOLDERS_BY_NAME ? LLInventoryFilter::SO_FOLDERS_BY_WEIGHT : LLInventoryFilter::SO_FOLDERS_BY_NAME);
         mAllPanel->setSortOrder(mSortOrder);
 	}
-    // View/filter options
-	else if (chosen_item == "show_all")
-	{
-        mFilterType = LLInventoryFilter::FILTERTYPE_NONE;
-        mAllPanel->getFilter().resetDefault();
-	}
-	else if (chosen_item == "show_unassociated")
-	{
-        mFilterType = LLInventoryFilter::FILTERTYPE_MARKETPLACE_UNASSOCIATED;
-        mAllPanel->getFilter().resetDefault();
-        mAllPanel->getFilter().setFilterMarketplaceUnassociatedFolders();
-	}
-	else if (chosen_item == "show_active")
-	{
-        mFilterType = LLInventoryFilter::FILTERTYPE_MARKETPLACE_ACTIVE;
-        mAllPanel->getFilter().resetDefault();
-        mAllPanel->getFilter().setFilterMarketplaceActiveFolders();
-	}
-	else if (chosen_item == "show_inactive")
-	{
-        mFilterType = LLInventoryFilter::FILTERTYPE_MARKETPLACE_INACTIVE;
-        mAllPanel->getFilter().resetDefault();
-        mAllPanel->getFilter().setFilterMarketplaceInactiveFolders();
-	}
 }
 
 bool LLPanelMarketplaceListings::onViewSortMenuItemCheck(const LLSD& userdata)
@@ -149,14 +125,6 @@ bool LLPanelMarketplaceListings::onViewSortMenuItemCheck(const LLSD& userdata)
     
 	if (chosen_item == "sort_by_stock_amount")
 		return mSortOrder == LLInventoryFilter::SO_FOLDERS_BY_WEIGHT;
-	if (chosen_item == "show_all")
-		return mFilterType == LLInventoryFilter::FILTERTYPE_NONE;
-	if (chosen_item == "show_unassociated")
-		return mFilterType == LLInventoryFilter::FILTERTYPE_MARKETPLACE_UNASSOCIATED;
-	if (chosen_item == "show_active")
-		return mFilterType == LLInventoryFilter::FILTERTYPE_MARKETPLACE_ACTIVE;
-	if (chosen_item == "show_inactive")
-		return mFilterType == LLInventoryFilter::FILTERTYPE_MARKETPLACE_INACTIVE;
 	return false;
 }
 
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 d08cb23483..cff5ec1040 100755
--- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
@@ -13,37 +13,4 @@
          function="Marketplace.ViewSort.CheckItem"
          parameter="sort_by_stock_amount"/>
     </menu_item_check>
-    <menu_item_separator layout="topleft" />
-    <menu_item_check name="show_all" label="Show All">
-        <menu_item_check.on_click
-        function="Marketplace.ViewSort.Action"
-        parameter="show_all" />
-        <menu_item_check.on_check
-        function="Marketplace.ViewSort.CheckItem"
-        parameter="show_all" />
-    </menu_item_check>
-    <menu_item_check name="show_unassociated" label="Show Unassociated Listings Only">
-        <menu_item_check.on_click
-        function="Marketplace.ViewSort.Action"
-        parameter="show_unassociated" />
-        <menu_item_check.on_check
-        function="Marketplace.ViewSort.CheckItem"
-        parameter="show_unassociated" />
-    </menu_item_check>
-    <menu_item_check name="show_active" label="Show Active Listings Only">
-        <menu_item_check.on_click
-        function="Marketplace.ViewSort.Action"
-        parameter="show_active" />
-        <menu_item_check.on_check
-        function="Marketplace.ViewSort.CheckItem"
-        parameter="show_active" />
-    </menu_item_check>
-    <menu_item_check name="show_inactive" label="Show Inactive Listings Only">
-        <menu_item_check.on_click
-        function="Marketplace.ViewSort.Action"
-        parameter="show_inactive" />
-        <menu_item_check.on_check
-        function="Marketplace.ViewSort.CheckItem"
-        parameter="show_inactive" />
-    </menu_item_check>
 </toggleable_menu>