MAINT-5938 FIXED when Marketplace is down viewer errors 499 at each login and teleport

1 files changed, 11 insertions, 2 deletions

diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index d5bfe1df4a..0572ac4c8c 100755
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -174,8 +174,17 @@ protected:
             log_SLM_infos("Get /merchant", getStatus(), "Merchant is not migrated");
             LLMarketplaceData::instance().setSLMStatus(MarketplaceStatusCodes::MARKET_PLACE_NOT_MIGRATED_MERCHANT);
         }
-		else
-		{
+        else if (HTTP_INTERNAL_ERROR == getStatus())
+        {
+            // 499 includes timeout and ssl error - marketplace is down or having issues, we do not show it in this request according to MAINT-5938
+            LL_WARNS("SLM") << "SLM Merchant Request failed with status: " << getStatus()
+                                    << ", reason : " << getReason()
+                                    << ", code : " << getContent().get("error_code")
+                                    << ", description : " << getContent().get("error_description") << LL_ENDL;
+            LLMarketplaceData::instance().setSLMStatus(MarketplaceStatusCodes::MARKET_PLACE_CONNECTION_FAILURE);
+        }
+        else
+        {
             log_SLM_warning("Get /merchant", getStatus(), getReason(), getContent().get("error_code"), getContent().get("error_description"));
             LLMarketplaceData::instance().setSLMStatus(MarketplaceStatusCodes::MARKET_PLACE_CONNECTION_FAILURE);
 		}