diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-01-18 23:29:27 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-01-18 23:29:27 +0200 |
| commit | 993908c8b47aa865b07f7f58b6f85eb2e38efcbc (patch) | |
| tree | 045e754baaa08c1c9cb8178a50e48e1a20fe67a9 /indra/newview/llinventorybridge.cpp | |
| parent | 05693d480fdbfcda44f8670c8970338a4b66fc45 (diff) | |
SL-16639 Fixed Marketplace folder depth limit not working in some cases
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 81b55c1073..c3ef83bcfa 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1102,7 +1102,10 @@ void LLInvFVBridge::addMarketplaceContextMenuOptions(U32 flags, LLInventoryModel::cat_array_t categories; LLInventoryModel::item_array_t items; gInventory.collectDescendents(local_version_folder_id, categories, items, FALSE); - if (categories.size() >= gSavedSettings.getU32("InventoryOutboxMaxFolderCount")) + LLCachedControl<U32> max_depth(gSavedSettings, "InventoryOutboxMaxFolderDepth", 4); + LLCachedControl<U32> max_count(gSavedSettings, "InventoryOutboxMaxFolderCount", 20); + if (categories.size() >= max_count + || depth > (max_depth + 1)) { disabled_items.push_back(std::string("New Folder")); } |