diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-30 11:02:31 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-30 11:02:31 -0400 |
| commit | dfdb88305e4612c54f190c1ba237bdb609224d74 (patch) | |
| tree | 23f73597a41f8db0cc0c98b64255d620e931ba20 /indra/newview/llinventoryfunctions.cpp | |
| parent | 5ed8df22cd59680a685c4ada7daa5555bf59d4fe (diff) | |
| parent | 4189cb74421794ba123bf8724caa843c9d9d1c78 (diff) | |
Merge branch 'release/maint-b' into nat/catch-test-blown-stack.
Retargeting PR #1496 to Maint B.
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( |