Fix deleting object that have been persisted already from the DB

This commit is contained in:
Melanie Thielker
2008-11-19 01:37:39 +00:00
parent 401a250491
commit a104cc2c62
2 changed files with 6 additions and 1 deletions

View File

@@ -42,6 +42,7 @@ namespace OpenSim.Region.Environment.Scenes
public IClientAPI remoteClient;
public SceneObjectGroup objectGroup;
public UUID folderID;
public bool permissionToDelete;
}
/// <summary>
@@ -87,6 +88,7 @@ namespace OpenSim.Region.Environment.Scenes
dtis.folderID = folderID;
dtis.objectGroup = objectGroup;
dtis.remoteClient = remoteClient;
dtis.permissionToDelete = permissionToDelete;
m_inventoryDeletes.Enqueue(dtis);
}
@@ -127,6 +129,8 @@ namespace OpenSim.Region.Environment.Scenes
try
{
if (x.permissionToDelete)
m_scene.DeleteFromStorage(x.objectGroup.UUID);
m_scene.DeleteToInventory(x.destination, x.folderID, x.objectGroup, x.remoteClient);
}
catch (Exception e)