diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs index 97eb7a5..7ff78a5 100644 --- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs | |||
@@ -42,7 +42,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
42 | public IClientAPI remoteClient; | 42 | public IClientAPI remoteClient; |
43 | public SceneObjectGroup objectGroup; | 43 | public SceneObjectGroup objectGroup; |
44 | public UUID folderID; | 44 | public UUID folderID; |
45 | public bool permissionToDelete; | ||
46 | } | 45 | } |
47 | 46 | ||
48 | /// <summary> | 47 | /// <summary> |
@@ -88,7 +87,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
88 | dtis.folderID = folderID; | 87 | dtis.folderID = folderID; |
89 | dtis.objectGroup = objectGroup; | 88 | dtis.objectGroup = objectGroup; |
90 | dtis.remoteClient = remoteClient; | 89 | dtis.remoteClient = remoteClient; |
91 | dtis.permissionToDelete = permissionToDelete; | ||
92 | 90 | ||
93 | m_inventoryDeletes.Enqueue(dtis); | 91 | m_inventoryDeletes.Enqueue(dtis); |
94 | } | 92 | } |
@@ -129,13 +127,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
129 | 127 | ||
130 | try | 128 | try |
131 | { | 129 | { |
132 | m_scene.DeleteToInventory(x.destination, | 130 | m_scene.DeleteToInventory(x.destination, x.folderID, x.objectGroup, x.remoteClient); |
133 | x.folderID, x.objectGroup, x.remoteClient, | ||
134 | x.permissionToDelete); | ||
135 | } | 131 | } |
136 | catch (Exception e) | 132 | catch (Exception e) |
137 | { | 133 | { |
138 | m_log.DebugFormat("Exception background deleting object: "+e.ToString()); | 134 | m_log.DebugFormat("Exception background deleting object: " +e); |
139 | } | 135 | } |
140 | 136 | ||
141 | return true; | 137 | return true; |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 5dd1654..0c217dd 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 | |||
1639 | /// <param name="remoteClient"> </param> | 1639 | /// <param name="remoteClient"> </param> |
1640 | /// <param name="objectGroup"></param> | 1640 | /// <param name="objectGroup"></param> |
1641 | /// <param name="folderID"></param> | 1641 | /// <param name="folderID"></param> |
1642 | /// <param name="permissionToDelete"></param> | ||
1643 | public virtual UUID DeleteToInventory(int destination, UUID folderID, | 1642 | public virtual UUID DeleteToInventory(int destination, UUID folderID, |
1644 | SceneObjectGroup objectGroup, IClientAPI remoteClient, | 1643 | SceneObjectGroup objectGroup, IClientAPI remoteClient) |
1645 | bool permissionToDelete) | ||
1646 | { | 1644 | { |
1647 | UUID assetID = UUID.Zero; | 1645 | UUID assetID = UUID.Zero; |
1648 | 1646 | ||