diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-11 08:37:03 +0300 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-11 08:37:43 +0300 |
commit | 534605eb228c8b9ab9df0137394f3f55b7f7b022 (patch) | |
tree | caed3347d6780d73ac2b66296552fedc0a9f7938 /indra/newview/llinventoryfunctions.cpp | |
parent | d1cf13f31e75807500aff0cf49812a76aff2bd74 (diff) | |
parent | a73773bc1abdac6bc3beea36fd4ba58eba686e13 (diff) |
Merge branch 'main' (featurette) into inventory_favorites
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 1f53ae5afd..4fbd8856b9 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( |