diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs | 20 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 6 |
2 files changed, 10 insertions, 16 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs index 442b40d..97eb7a5 100644 --- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs | |||
@@ -126,18 +126,16 @@ namespace OpenSim.Region.Environment.Scenes | |||
126 | "[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left); | 126 | "[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left); |
127 | 127 | ||
128 | x = m_inventoryDeletes.Dequeue(); | 128 | x = m_inventoryDeletes.Dequeue(); |
129 | if (!x.objectGroup.IsDeleted) | 129 | |
130 | try | ||
131 | { | ||
132 | m_scene.DeleteToInventory(x.destination, | ||
133 | x.folderID, x.objectGroup, x.remoteClient, | ||
134 | x.permissionToDelete); | ||
135 | } | ||
136 | catch (Exception e) | ||
130 | { | 137 | { |
131 | try | 138 | m_log.DebugFormat("Exception background deleting object: "+e.ToString()); |
132 | { | ||
133 | m_scene.DeleteToInventory(x.destination, | ||
134 | x.folderID, x.objectGroup, x.remoteClient, | ||
135 | x.permissionToDelete); | ||
136 | } | ||
137 | catch (Exception e) | ||
138 | { | ||
139 | m_log.DebugFormat("Exception background deleting object: "+e.ToString()); | ||
140 | } | ||
141 | } | 139 | } |
142 | 140 | ||
143 | return true; | 141 | return true; |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index cc8501d..5dd1654 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -1763,11 +1763,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1763 | } | 1763 | } |
1764 | } | 1764 | } |
1765 | } | 1765 | } |
1766 | 1766 | ||
1767 | // Finally remove the item, for reals this time. | ||
1768 | if (permissionToDelete) | ||
1769 | DeleteSceneObject(objectGroup, false); | ||
1770 | |||
1771 | return assetID; | 1767 | return assetID; |
1772 | } | 1768 | } |
1773 | 1769 | ||