diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs | 10 |
1 files changed, 5 insertions, 5 deletions
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 | |||
38 | { | 38 | { |
39 | class DeleteToInventoryHolder | 39 | class DeleteToInventoryHolder |
40 | { | 40 | { |
41 | public int destination; | 41 | public DeRezAction action; |
42 | public IClientAPI remoteClient; | 42 | public IClientAPI remoteClient; |
43 | public SceneObjectGroup objectGroup; | 43 | public SceneObjectGroup objectGroup; |
44 | public UUID folderID; | 44 | public UUID folderID; |
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
74 | /// <summary> | 74 | /// <summary> |
75 | /// Delete the given object from the scene | 75 | /// Delete the given object from the scene |
76 | /// </summary> | 76 | /// </summary> |
77 | public void DeleteToInventory(int destination, UUID folderID, | 77 | public void DeleteToInventory(DeRezAction action, UUID folderID, |
78 | SceneObjectGroup objectGroup, IClientAPI remoteClient, | 78 | SceneObjectGroup objectGroup, IClientAPI remoteClient, |
79 | bool permissionToDelete) | 79 | bool permissionToDelete) |
80 | { | 80 | { |
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
84 | lock (m_inventoryDeletes) | 84 | lock (m_inventoryDeletes) |
85 | { | 85 | { |
86 | DeleteToInventoryHolder dtis = new DeleteToInventoryHolder(); | 86 | DeleteToInventoryHolder dtis = new DeleteToInventoryHolder(); |
87 | dtis.destination = destination; | 87 | dtis.action = action; |
88 | dtis.folderID = folderID; | 88 | dtis.folderID = folderID; |
89 | dtis.objectGroup = objectGroup; | 89 | dtis.objectGroup = objectGroup; |
90 | dtis.remoteClient = remoteClient; | 90 | dtis.remoteClient = remoteClient; |
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
136 | 136 | ||
137 | try | 137 | try |
138 | { | 138 | { |
139 | m_scene.DeleteToInventory(x.destination, x.folderID, x.objectGroup, x.remoteClient); | 139 | m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient); |
140 | if (x.permissionToDelete) | 140 | if (x.permissionToDelete) |
141 | m_scene.DeleteSceneObject(x.objectGroup, false); | 141 | m_scene.DeleteSceneObject(x.objectGroup, false); |
142 | } | 142 | } |
@@ -149,7 +149,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
149 | } | 149 | } |
150 | } | 150 | } |
151 | } | 151 | } |
152 | catch(Exception e) | 152 | catch (Exception e) |
153 | { | 153 | { |
154 | // We can't put the object group details in here since the root part may have disappeared (which is where these sit). | 154 | // We can't put the object group details in here since the root part may have disappeared (which is where these sit). |
155 | // FIXME: This needs to be fixed. | 155 | // FIXME: This needs to be fixed. |