From 5ee79c62bfbfd5ee6eaed24e3bc4c284e9b508aa Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 2 Dec 2009 10:21:24 +0000 Subject: [PATCH] Change default destination of deleted items to the trash folder. Everything else still goes to L&F --- .../Region/Framework/Scenes/Scene.Inventory.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 66fb918bd7..09d02f4ca9 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -1722,10 +1722,19 @@ namespace OpenSim.Region.Framework.Scenes if (folderID == UUID.Zero && folder == null) { - // Catch all. Use lost & found - // + if (action == DeRezAction.Delete) + { + // Deletes go to trash by default + // + folder = InventoryService.GetFolderForType(userID, AssetType.TrashFolder); + } + else + { + // Catch all. Use lost & found + // - folder = InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder); + folder = InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder); + } } if (folder == null) // None of the above