diff options
| author | Howard Stearns <aech@lindenlab.com> | 2022-05-12 17:09:30 +0000 |
|---|---|---|
| committer | Howard Stearns <aech@lindenlab.com> | 2022-05-12 17:09:30 +0000 |
| commit | 44f70be1e447664ec3ee050e85a8e14965fff4e7 (patch) | |
| tree | c1a5c851a06dd77a27cbc135e4625701e743902e /indra/newview/llinventorybridge.cpp | |
| parent | 4cfcbca748e825b4904e7f136fa625b1a0f79dfb (diff) | |
| parent | 915de3eb556c22216fd3c76e2de4a2ab1953dbe0 (diff) | |
Merged DRTVWR-544-maint into SL-12238
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 342920630b..0c2f5933e8 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")); } |