1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index 8d12c98da8..6ed7ae91b3 100755
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -83,6 +83,7 @@ void LLPanelMarketplaceListings::buildAllPanels()
 	panel->getFilter().markDefault();
     
 	LLTabContainer* tabs_panel = getChild<LLTabContainer>("marketplace_filter_tabs");
+	tabs_panel->setCommitCallback(boost::bind(&LLPanelMarketplaceListings::onTabChange, this));
     tabs_panel->selectTabPanel(mAllPanel);
 }
 
@@ -120,6 +121,15 @@ void LLPanelMarketplaceListings::onSelectionChange(LLInventoryPanel *panel, cons
 	panel->onSelectionChange(items, user_action);
 }
 
+void LLPanelMarketplaceListings::onTabChange()
+{
+	LLTabContainer* tabs_panel = getChild<LLTabContainer>("marketplace_filter_tabs");
+    LLInventoryPanel* panel = static_cast<LLInventoryPanel*>(tabs_panel->getCurrentPanel());
+    // If the panel doesn't allow drop on root, it doesn't allow the creation of new folder on root either
+	LLButton* add_btn = getChild<LLButton>("add_btn");
+    add_btn->setEnabled(panel->getAllowDropOnRoot());
+}
+
 void LLPanelMarketplaceListings::onAddButtonClicked()
 {
 	LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);