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

Continuing refactor. Refactor DeRezObject to deal with multiple objects

Browse Source
This commit is contained in:
Melanie Thielker
2010-06-01 02:27:30 +02:00
parent f57f2370f1
commit bf233ea0dc
5 changed files with 122 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
View File

@@ -40,7 +40,7 @@ namespace OpenSim.Region.Framework.Scenes
{
public DeRezAction action;
public IClientAPI remoteClient;
public SceneObjectGroup objectGroup;
public List<SceneObjectGroup> objectGroups;
public UUID folderID;
public bool permissionToDelete;
}
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Framework.Scenes
/// Delete the given object from the scene
/// </summary>
public void DeleteToInventory(DeRezAction action, UUID folderID,
SceneObjectGroup objectGroup, IClientAPI remoteClient,
List<SceneObjectGroup> objectGroups, IClientAPI remoteClient,
bool permissionToDelete)
{
if (Enabled)
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Framework.Scenes
DeleteToInventoryHolder dtis = new DeleteToInventoryHolder();
dtis.action = action;
dtis.folderID = folderID;
dtis.objectGroup = objectGroup;
dtis.objectGroups = objectGroups;
dtis.remoteClient = remoteClient;
dtis.permissionToDelete = permissionToDelete;
@@ -103,7 +103,10 @@ namespace OpenSim.Region.Framework.Scenes
// This is not ideal since the object will still be available for manipulation when it should be, but it's
// better than losing the object for now.
if (permissionToDelete)
objectGroup.DeleteGroup(false);
{
foreach (SceneObjectGroup g in objectGroups)
g.DeleteGroup(false);
}
}
private void InventoryRunDeleteTimer(object sender, ElapsedEventArgs e)
@@ -140,9 +143,12 @@ namespace OpenSim.Region.Framework.Scenes
{
IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
if (invAccess != null)
invAccess.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient);
invAccess.DeleteToInventory(x.action, x.folderID, x.objectGroups, x.remoteClient);
if (x.permissionToDelete)
m_scene.DeleteSceneObject(x.objectGroup, false);
{
foreach (SceneObjectGroup g in x.objectGroups)
m_scene.DeleteSceneObject(g, false);
}
}
catch (Exception e)
{