OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix deleting object that have been persisted already from the DB

0.6.1-post-fixes
Melanie Thielker 2008-11-19 01:37:39 +00:00
parent 401a250491
commit a104cc2c62
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
View File

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

3
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -1638,8 +1638,9 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="remoteClient"> </param> /// <param name="remoteClient"> </param>
/// <param name="objectGroup"></param> /// <param name="objectGroup"></param>
/// <param name="folderID"></param> /// <param name="folderID"></param>
/// <param name="permissionToDelete"></param>
public virtual UUID DeleteToInventory(int destination, UUID folderID, public virtual UUID DeleteToInventory(int destination, UUID folderID,
SceneObjectGroup objectGroup, IClientAPI remoteClient) SceneObjectGroup objectGroup, IClientAPI remoteClient)
{ {
UUID assetID = UUID.Zero; UUID assetID = UUID.Zero;