diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-04 10:39:09 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-04 10:39:09 -0700 |
| commit | 6161d2f479868508f41d1236ee819a667fbd7f9f (patch) | |
| tree | 6e13b35cb13af43a570a6cab9ad433924867561d /indra/newview | |
| parent | fdbf73d95392e2dc64e3193a9cc3ea4c8260b8dc (diff) | |
| parent | 82d713782529074b03720833038cb0df2b8bcffd (diff) | |
Merge remote-tracking branch 'origin/release/maint-x' into project/gltf_development
Diffstat (limited to 'indra/newview')
| -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 5533c0328e..8c2bc80b6b 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( |