ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

* On delete to inventory, actually remove the group from the scene before the async stage.

Browse Source 
* Last time I accidentally left the existing code in place that merely wiped the group from the client (but not the scene)
* Put in an incomplete 'delete object o inventory' test to assert that this happens
This commit is contained in:
Justin Clarke Casey
2008-11-21 18:17:01 +00:00
parent 82aa8e0327
commit e261c97470
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,6 @@ namespace OpenSim.Region.Environment.Scenes
public IClientAPI remoteClient;
public SceneObjectGroup objectGroup;
public UUID folderID;
public bool permissionToDelete;
}
/// <summary>
@@ -88,7 +87,6 @@ namespace OpenSim.Region.Environment.Scenes
dtis.folderID = folderID;
dtis.objectGroup = objectGroup;
dtis.remoteClient = remoteClient;
dtis.permissionToDelete = permissionToDelete;
m_inventoryDeletes.Enqueue(dtis);
}
@@ -96,9 +94,8 @@ namespace OpenSim.Region.Environment.Scenes
if (Enabled)
m_inventoryTicker.Start();
// Visually remove it, even if it isnt really gone yet.
if (permissionToDelete)
objectGroup.DeleteGroup(false);
m_scene.DeleteSceneObject(objectGroup, false);
}
private void InventoryRunDeleteTimer(object sender, ElapsedEventArgs e)
@@ -129,8 +126,6 @@ namespace OpenSim.Region.Environment.Scenes
try
{
if (x.permissionToDelete)
m_scene.DeleteSceneObject(x.objectGroup, false);
m_scene.DeleteToInventory(x.destination, x.folderID, x.objectGroup, x.remoteClient);
}
catch (Exception e)