From c2363c3ae95c38a6ed175375d5af638d64acef22 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 14 Jun 2017 11:29:30 +0300 Subject: MAINT-7489 FIXED Viewer may silently empty trash without the users request under obscure inventory folder states --- indra/newview/llinventorymodel.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 0ccaa1992d..dc75e09ad9 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -462,12 +462,8 @@ void LLInventoryModel::consolidateForType(const LLUUID& main_id, LLFolderType::E } // Purge the emptied folder - // Note: we'd like to use purgeObject() but it doesn't cleanly eliminate the folder - // which leads to issues further down the road when the folder is found again - //purgeObject(folder_id); - // We remove the folder and empty the trash instead which seems to work - removeCategory(folder_id); - gInventory.emptyFolderType("", LLFolderType::FT_TRASH); + removeCategory(folder_id); + remove_inventory_category(folder_id, NULL); } } -- cgit v1.2.3