Merge branch 'master' into DRTVWR-565-maint-P

1 files changed, 19 insertions, 1 deletions

diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index 524162ba51..e755e9924c 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -579,7 +579,25 @@ void LLFloaterMarketplaceListings::updateView()
 
         // Update the top message or flip to the tabs and folders view
         // *TODO : check those messages and create better appropriate ones in strings.xml
-        if (mRootFolderId.notNull())
+        if (mkt_status == MarketplaceStatusCodes::MARKET_PLACE_CONNECTION_FAILURE)
+        {
+            std::string reason = LLMarketplaceData::instance().getSLMConnectionfailureReason();
+            if (reason.empty())
+            {
+                text = LLTrans::getString("InventoryMarketplaceConnectionError");
+            }
+            else
+            {
+                LLSD args;
+                args["[REASON]"] = reason;
+                text = LLTrans::getString("InventoryMarketplaceConnectionErrorReason", args);
+            }
+
+            title = LLTrans::getString("InventoryOutboxErrorTitle");
+            tooltip = LLTrans::getString("InventoryOutboxErrorTooltip");
+            LL_WARNS() << "Marketplace status code: " << mkt_status << LL_ENDL;
+        }
+        else if (mRootFolderId.notNull())
         {
             // "Marketplace listings is empty!" message strings
             text = LLTrans::getString("InventoryMarketplaceListingsNoItems", subs);