From 00b223f2a44023eed25dae1e558ba20c57f6490f Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Wed, 20 Mar 2013 22:51:11 +0100 Subject: [PATCH] Do not request empty folders. Doing this resulted in a 404 on Aditi, and although that was a server bug; it still doesn't seem to make much sense to do the request in the first place. --- .../newview/llinventorymodelbackgroundfetch.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index 3dce0c96a..6b88ab5c5 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -618,18 +618,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch() if (fetch_info.mIsCategory) { const LLUUID &cat_id = fetch_info.mUUID; - if (cat_id.isNull()) //DEV-17797 - { - LLSD folder_sd; - folder_sd["folder_id"] = LLUUID::null.asString(); - folder_sd["owner_id"] = gAgent.getID(); - folder_sd["sort_order"] = (LLSD::Integer)sort_order; - folder_sd["fetch_folders"] = (LLSD::Boolean)FALSE; - folder_sd["fetch_items"] = (LLSD::Boolean)TRUE; - folder_request_body["folders"].append(folder_sd); - folder_count++; - } - else + if (!cat_id.isNull()) { const LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id); @@ -664,9 +653,9 @@ void LLInventoryModelBackgroundFetch::bulkFetch() } } } + if (fetch_info.mRecursive) + recursive_cats.push_back(cat_id); } - if (fetch_info.mRecursive) - recursive_cats.push_back(cat_id); } else {