Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK

# Conflicts:
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llkeyconflict.cpp

1 files changed, 19 insertions, 0 deletions

diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index aa0c7fb73b..044c76ce2c 100644
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -1025,6 +1025,12 @@ void LLMarketplaceData::createSLMListingCoro(LLUUID folderId, LLUUID versionId,
     
     log_SLM_infos("Post /listings", status.getType(), result);
 
+    if (!result.has("listings") || !result["listings"].isArray() || result["listings"].size() == 0)
+    {
+        LL_INFOS("SLM") << "Received an empty response for folder " << folderId << LL_ENDL;
+        return;
+    }
+
     // Extract the info from the results
     for (LLSD::array_iterator it = result["listings"].beginArray();
         it != result["listings"].endArray(); ++it)
@@ -1092,6 +1098,19 @@ void LLMarketplaceData::updateSLMListingCoro(LLUUID folderId, S32 listingId, LLU
 
     log_SLM_infos("Put /listing", status.getType(), result);
 
+    if (!result.has("listings") || !result["listings"].isArray() || result["listings"].size() == 0)
+    {
+        LL_INFOS("SLM") << "Received an empty response for listing " << listingId << " folder " << folderId << LL_ENDL;
+        // Try to get listing more directly after a delay
+        const float FORCE_UPDATE_TIMEOUT = 5.0;
+        llcoro::suspendUntilTimeout(FORCE_UPDATE_TIMEOUT);
+        if (!LLApp::isExiting() && LLMarketplaceData::instanceExists())
+        {
+            getSLMListing(listingId);
+        }
+        return;
+    }
+
     // Extract the info from the Json string
     for (LLSD::array_iterator it = result["listings"].beginArray();
         it != result["listings"].endArray(); ++it)