aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs17
1 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
index 21fa71b..bd81a6d 100644
--- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -38,8 +38,7 @@ namespace OpenSim.Region.Environment.Scenes
38{ 38{
39 class DeleteToInventoryHolder 39 class DeleteToInventoryHolder
40 { 40 {
41 public DeRezObjectPacket DeRezPacket; 41 public int destination;
42 public EntityBase selectedEnt;
43 public IClientAPI remoteClient; 42 public IClientAPI remoteClient;
44 public SceneObjectGroup objectGroup; 43 public SceneObjectGroup objectGroup;
45 public UUID folderID; 44 public UUID folderID;
@@ -70,20 +69,19 @@ namespace OpenSim.Region.Environment.Scenes
70 /// <summary> 69 /// <summary>
71 /// Delete the given object from the scene 70 /// Delete the given object from the scene
72 /// </summary> 71 /// </summary>
73 public void DeleteToInventory( 72 public void DeleteToInventory(int destination, UUID folderID,
74 DeRezObjectPacket DeRezPacket, UUID folderID, SceneObjectGroup objectGroup, IClientAPI remoteClient, 73 SceneObjectGroup objectGroup, IClientAPI remoteClient,
75 EntityBase selectedEnt, bool permissionToDelete) 74 bool permissionToDelete)
76 { 75 {
77 m_inventoryTicker.Stop(); 76 m_inventoryTicker.Stop();
78 77
79 lock (m_inventoryDeletes) 78 lock (m_inventoryDeletes)
80 { 79 {
81 DeleteToInventoryHolder dtis = new DeleteToInventoryHolder(); 80 DeleteToInventoryHolder dtis = new DeleteToInventoryHolder();
82 dtis.DeRezPacket = DeRezPacket; 81 dtis.destination = destination;
83 dtis.folderID = folderID; 82 dtis.folderID = folderID;
84 dtis.objectGroup = objectGroup; 83 dtis.objectGroup = objectGroup;
85 dtis.remoteClient = remoteClient; 84 dtis.remoteClient = remoteClient;
86 dtis.selectedEnt = selectedEnt;
87 dtis.permissionToDelete = permissionToDelete; 85 dtis.permissionToDelete = permissionToDelete;
88 86
89 m_inventoryDeletes.Enqueue(dtis); 87 m_inventoryDeletes.Enqueue(dtis);
@@ -121,8 +119,9 @@ namespace OpenSim.Region.Environment.Scenes
121 "[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left); 119 "[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left);
122 120
123 x = m_inventoryDeletes.Dequeue(); 121 x = m_inventoryDeletes.Dequeue();
124 m_scene.DeleteToInventory( 122 m_scene.DeleteToInventory(x.destination,
125 x.DeRezPacket, x.selectedEnt, x.remoteClient, x.objectGroup, x.folderID, x.permissionToDelete); 123 x.folderID, x.objectGroup, x.remoteClient,
124 x.permissionToDelete);
126 125
127 return true; 126 return true;
128 } 127 }