SL-19534 Better fetch failure handling

1 files changed, 20 insertions, 0 deletions

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index c8bf8f67ce..e988f949e2 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -487,6 +487,26 @@ void LLInventoryModelBackgroundFetch::onAISFodlerCalback(const LLUUID &request_i
             mFetchFolderQueue.push_front(FetchQueueInfo(request_id, FT_CONTENT_RECURSIVE));
             gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
         }
+        else if (recursion == FT_CONTENT_RECURSIVE)
+        {
+            LL_WARNS() << "Failed to download folder: " << request_id << " Requesting known content separately" << LL_ENDL;
+            LLInventoryModel::cat_array_t  *categories(NULL);
+            LLInventoryModel::item_array_t *items(NULL);
+            gInventory.getDirectDescendentsOf(request_id, categories, items);
+            if (categories)
+            {
+                for (LLInventoryModel::cat_array_t::const_iterator it = categories->begin(); it != categories->end(); ++it)
+                {
+                    mFetchFolderQueue.push_front(FetchQueueInfo((*it)->getUUID(), FT_RECURSIVE));
+                }
+                if (!mFetchFolderQueue.empty())
+                {
+                    mBackgroundFetchActive = true;
+                    mFolderFetchActive     = true;
+                    gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+                }
+            }
+        }
     }
     else
     {