aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-12-02 10:21:24 +0000
committerMelanie2009-12-02 10:21:24 +0000
commit5ee79c62bfbfd5ee6eaed24e3bc4c284e9b508aa (patch)
treeebad01d8fa3d66b52235dc73be7b9cd7ca7bb562 /OpenSim
parent* Test Autoconvert line ending on my repo.. (diff)
downloadopensim-SC_OLD-5ee79c62bfbfd5ee6eaed24e3bc4c284e9b508aa.zip
opensim-SC_OLD-5ee79c62bfbfd5ee6eaed24e3bc4c284e9b508aa.tar.gz
opensim-SC_OLD-5ee79c62bfbfd5ee6eaed24e3bc4c284e9b508aa.tar.bz2
opensim-SC_OLD-5ee79c62bfbfd5ee6eaed24e3bc4c284e9b508aa.tar.xz
Change default destination of deleted items to the trash folder. Everything
else still goes to L&F
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs15
1 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 66fb918..09d02f4 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
1722 1722
1723 if (folderID == UUID.Zero && folder == null) 1723 if (folderID == UUID.Zero && folder == null)
1724 { 1724 {
1725 // Catch all. Use lost & found 1725 if (action == DeRezAction.Delete)
1726 // 1726 {
1727 // Deletes go to trash by default
1728 //
1729 folder = InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
1730 }
1731 else
1732 {
1733 // Catch all. Use lost & found
1734 //
1727 1735
1728 folder = InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder); 1736 folder = InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
1737 }
1729 } 1738 }
1730 1739
1731 if (folder == null) // None of the above 1740 if (folder == null) // None of the above