From df9b0e9e1131cd3fd9b0361d4d75c7242e04d848 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 28 Nov 2008 17:18:10 +0000 Subject: * refactor: Replace derez destiation magic numbers with an enumeration --- .../Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs') diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs index 20cf318..03b3977 100644 --- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs @@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Scenes { class DeleteToInventoryHolder { - public int destination; + public DeRezAction action; public IClientAPI remoteClient; public SceneObjectGroup objectGroup; public UUID folderID; @@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// Delete the given object from the scene /// - public void DeleteToInventory(int destination, UUID folderID, + public void DeleteToInventory(DeRezAction action, UUID folderID, SceneObjectGroup objectGroup, IClientAPI remoteClient, bool permissionToDelete) { @@ -84,7 +84,7 @@ namespace OpenSim.Region.Environment.Scenes lock (m_inventoryDeletes) { DeleteToInventoryHolder dtis = new DeleteToInventoryHolder(); - dtis.destination = destination; + dtis.action = action; dtis.folderID = folderID; dtis.objectGroup = objectGroup; dtis.remoteClient = remoteClient; @@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Scenes try { - m_scene.DeleteToInventory(x.destination, x.folderID, x.objectGroup, x.remoteClient); + m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient); if (x.permissionToDelete) m_scene.DeleteSceneObject(x.objectGroup, false); } @@ -149,7 +149,7 @@ namespace OpenSim.Region.Environment.Scenes } } } - catch(Exception e) + catch (Exception e) { // We can't put the object group details in here since the root part may have disappeared (which is where these sit). // FIXME: This needs to be fixed. -- cgit v1.1