diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 11:20:18 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 11:20:18 +0300 |
| commit | 911bac75aa361818bc5ce34fd189fd53c312e934 (patch) | |
| tree | 7e01c1b0a01697bf865c20218f680244642b35d2 /indra/newview | |
| parent | bccc10db9a90d365c353baebf443fde2030ce970 (diff) | |
| parent | 82d713782529074b03720833038cb0df2b8bcffd (diff) | |
Merge branch 'release/maint-x' into marchcat/x-b-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( |