diff options
| author | Howard Stearns <aech@lindenlab.com> | 2022-01-24 16:52:29 +0000 |
|---|---|---|
| committer | Howard Stearns <aech@lindenlab.com> | 2022-01-24 16:52:29 +0000 |
| commit | fec246a2e6d380971080d95446cc55059be01352 (patch) | |
| tree | 358eca34c63a9256a26acadd0b3e379cb60dc0be /indra/newview/llinventorybridge.cpp | |
| parent | 67dc2924bf6f004326f8e22d1d92c4a071c946a4 (diff) | |
| parent | 5ab34ccc5a5ec0abd6526b16379d7e29d8668ec4 (diff) | |
Merged DRTVWR-544-maint into SL-316
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")); } |