From bb82076a4d2afd914d325f17443bb409d75bfe0e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 25 Dec 2014 12:17:07 -0800
Subject: Allow for richer semantics of object derez. Specifically, allow the
 existence of region modules that do other kinds of garbage collection.
 Instead of placing deleted objects in the user's Trash folder, or deleting
 them immediately (UseTrashOnDelete = false), a module may decide to take
 garbage collection under its control. For example, it may place derezzed
 objects in a certain area inworld and delete them later.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 5cc5606..b14e2f7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2182,13 +2182,16 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
+            // OK, we're done with permissions. Let's check if any part of the code prevents the objects from being deleted
+            bool canDelete = EventManager.TriggerDeRezRequested(remoteClient, deleteGroups, action);
+
             if (permissionToTake && (action != DeRezAction.Delete || this.m_useTrashOnDelete))
             {
                 m_asyncSceneObjectDeleter.DeleteToInventory(
                         action, destinationID, deleteGroups, remoteClient,
-                        permissionToDelete);
+                        permissionToDelete && canDelete);
             }
-            else if (permissionToDelete)
+            else if (permissionToDelete && canDelete)
             {
                 foreach (SceneObjectGroup g in deleteGroups)
                     DeleteSceneObject(g, false);
-- 
cgit v1.1