DD-170 : Check the Merchant Outbox API and hide the menu item if getting 503. Show SLM always.

1 files changed, 28 insertions, 8 deletions

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index b5262a7e1b..1daa74c68f 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -388,19 +388,33 @@ void set_underclothes_menu_options()
 	}
 }
 
-void set_merchant_menu()
+void set_merchant_SLM_menu()
 {
-    if (LLMarketplaceData::instance().getSLMStatus() == MarketplaceStatusCodes::MARKET_PLACE_NOT_MIGRATED_MERCHANT)
-    {
+    // DD-170 : SLM Alpha and Beta program : for the moment, we always show the SLM menu and 
+    // tools so that all merchants can try out the UI, even if not migrated.
+    // *TODO : Keep SLM UI hidden for non migrated merchant in released viewer
+    
+    //if (LLMarketplaceData::instance().getSLMStatus() == MarketplaceStatusCodes::MARKET_PLACE_NOT_MIGRATED_MERCHANT)
+    //{
         // Merchant not migrated: show only the old Merchant Outbox menu
-        gMenuHolder->getChild<LLView>("MerchantOutbox")->setVisible(TRUE);
-    }
-    else
-    {
+    //    gMenuHolder->getChild<LLView>("MerchantOutbox")->setVisible(TRUE);
+    //}
+    //else
+    //{
         // All other cases (new merchant, not merchant, migrated merchant): show the new Marketplace Listings menu and enable the tool
         gMenuHolder->getChild<LLView>("MarketplaceListings")->setVisible(TRUE);
         LLCommand* command = LLCommandManager::instance().getCommand("marketplacelistings");
 		gToolBarView->enableCommand(command->id(), true);
+    //}
+}
+
+void set_merchant_outbox_menu(U32 status, const LLSD& content)
+{
+    // If the merchant is fully migrated, the API is disabled (503) and we won't show the old menu item.
+    // In all other cases, we show it.
+    if (status != MarketplaceErrorCodes::IMPORT_SERVER_API_DISABLED)
+    {
+        gMenuHolder->getChild<LLView>("MerchantOutbox")->setVisible(TRUE);
     }
 }
 
@@ -411,11 +425,17 @@ void check_merchant_status()
         // Hide both merchant related menu items
         gMenuHolder->getChild<LLView>("MerchantOutbox")->setVisible(FALSE);
         gMenuHolder->getChild<LLView>("MarketplaceListings")->setVisible(FALSE);
+        
         // Also disable the toolbar button for Marketplace Listings
         LLCommand* command = LLCommandManager::instance().getCommand("marketplacelistings");
 		gToolBarView->enableCommand(command->id(), false);
+        
         // Launch an SLM test connection to get the merchant status
-        LLMarketplaceData::instance().initializeSLM(boost::bind(&set_merchant_menu));
+        LLMarketplaceData::instance().initializeSLM(boost::bind(&set_merchant_SLM_menu));
+        
+        // Launch a Merchant Outbox test connection to get the migration status
+        LLMarketplaceInventoryImporter::instance().setStatusReportCallback(boost::bind(&set_merchant_outbox_menu,_1, _2));
+        LLMarketplaceInventoryImporter::instance().initialize();
     }
 }