diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs index 97eb7a5ac3..7ff78a530a 100644 --- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs @@ -42,7 +42,6 @@ namespace OpenSim.Region.Environment.Scenes public IClientAPI remoteClient; public SceneObjectGroup objectGroup; public UUID folderID; - public bool permissionToDelete; } /// @@ -88,7 +87,6 @@ namespace OpenSim.Region.Environment.Scenes dtis.folderID = folderID; dtis.objectGroup = objectGroup; dtis.remoteClient = remoteClient; - dtis.permissionToDelete = permissionToDelete; m_inventoryDeletes.Enqueue(dtis); } @@ -129,13 +127,11 @@ namespace OpenSim.Region.Environment.Scenes try { - m_scene.DeleteToInventory(x.destination, - x.folderID, x.objectGroup, x.remoteClient, - x.permissionToDelete); + m_scene.DeleteToInventory(x.destination, x.folderID, x.objectGroup, x.remoteClient); } catch (Exception e) { - m_log.DebugFormat("Exception background deleting object: "+e.ToString()); + m_log.DebugFormat("Exception background deleting object: " +e); } return true; diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 5dd1654a18..0c217dd381 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -1639,10 +1639,8 @@ namespace OpenSim.Region.Environment.Scenes /// /// /// - /// public virtual UUID DeleteToInventory(int destination, UUID folderID, - SceneObjectGroup objectGroup, IClientAPI remoteClient, - bool permissionToDelete) + SceneObjectGroup objectGroup, IClientAPI remoteClient) { UUID assetID = UUID.Zero;