Merge branch 'master' into careminster

2009-12-02 10:22:21 +00:00 · 2009-12-02 10:22:21 +00:00 · 551696bb45
parent ded16d3529 5ee79c62bf
commit 551696bb45
1 changed files with 12 additions and 3 deletions
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@ -1725,12 +1725,21 @@ namespace OpenSim.Region.Framework.Scenes
                }

                if (folderID == UUID.Zero && folder == null)
+                {
+                    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);
                    }
+                }

                if (folder == null) // None of the above
                {