diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-06-10 17:24:19 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-06-10 17:24:19 -0400 |
| commit | 730d94779c0e798ec91b269b530a08f0eebaa13d (patch) | |
| tree | d4821d194caef6e71f3e31b578fde635a38bdb3b /indra/newview/llinventoryfunctions.cpp | |
| parent | d317454c82e016a02c8a708a0118f3ff29aa8e82 (diff) | |
| parent | 9f97ff7286aceef5be4e7589ca4af911edf30f12 (diff) | |
Merge release/materials_featurette to main on promotion of secondlife/viewer #648: Release/materials featurette
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
| -rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index c8aa235506..016b0880eb 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -843,12 +843,6 @@ bool get_is_category_and_children_removable(LLInventoryModel* model, const LLUUI return false; } - const LLUUID mp_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS); - if (mp_id.notNull() && gInventory.isObjectDescendentOf(folder_id, mp_id)) - { - return false; - } - LLInventoryModel::cat_array_t cat_array; LLInventoryModel::item_array_t item_array; model->collectDescendents( |