SL-19533 Fix 'fetching' state timeout

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 5f7950df08..8f1012868f 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -729,10 +729,12 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                     gInventory.getDirectDescendentsOf(cat_id, categories, items);
 
                     LLViewerInventoryCategory::EFetchType target_state = LLViewerInventoryCategory::FETCH_RECURSIVE;
-                    // technically limit is 'as many as you can put into url', but for now stop at 10
-                    const S32 batch_limit = 20;
                     bool content_done = true;
 
+                    // Top limit is 'as many as you can put into url'
+                    static LLCachedControl<S32> ais_batch(gSavedSettings, "BatchSizeAIS3", 20);
+                    S32 batch_limit = llclamp(ais_batch(), 1, 40);
+
                     for (LLInventoryModel::cat_array_t::iterator it = categories->begin();
                          it != categories->end();
                          ++it)