diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 12:29:32 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 12:29:32 +0300 |
| commit | ee05a06360a82489e85d8c875eb68a0f0b1ff91d (patch) | |
| tree | 56320780429fcd3468144a60e38a96fc72a254bf /indra/newview | |
| parent | e59216443619dd2280ce0fff316a2b9e2ee7cf5e (diff) | |
| parent | 82d713782529074b03720833038cb0df2b8bcffd (diff) | |
Merge branch 'release/maint-x' into marchcat/x-c-merge
to pick up mac build fixes
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 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( |