aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
index 58e0ca3..a9fa879 100644
--- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -42,6 +42,7 @@ 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;
45 } 46 }
46 47
47 /// <summary> 48 /// <summary>
@@ -87,6 +88,7 @@ namespace OpenSim.Region.Environment.Scenes
87 dtis.folderID = folderID; 88 dtis.folderID = folderID;
88 dtis.objectGroup = objectGroup; 89 dtis.objectGroup = objectGroup;
89 dtis.remoteClient = remoteClient; 90 dtis.remoteClient = remoteClient;
91 dtis.permissionToDelete = permissionToDelete;
90 92
91 m_inventoryDeletes.Enqueue(dtis); 93 m_inventoryDeletes.Enqueue(dtis);
92 } 94 }
@@ -127,6 +129,8 @@ namespace OpenSim.Region.Environment.Scenes
127 129
128 try 130 try
129 { 131 {
132 if (x.permissionToDelete)
133 m_scene.DeleteFromStorage(x.objectGroup.UUID);
130 m_scene.DeleteToInventory(x.destination, x.folderID, x.objectGroup, x.remoteClient); 134 m_scene.DeleteToInventory(x.destination, x.folderID, x.objectGroup, x.remoteClient);
131 } 135 }
132 catch (Exception e) 136 catch (Exception e)