From abfede7819e470c4a9d135b529c40d19fb94dca5 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 6 Oct 2010 19:59:30 +0200
Subject: Plumb the path for multiple object deletes
---
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 44 +++++-----------------
1 file changed, 9 insertions(+), 35 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 1bf6b87..4cc797b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1689,37 +1689,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- ///
- /// Called when one or more objects are removed from the environment into inventory.
- ///
- ///
- ///
- ///
- ///
- ///
- public virtual void DeRezObject(IClientAPI remoteClient, List localIDs,
- UUID groupID, DeRezAction action, UUID destinationID)
- {
- foreach (uint localID in localIDs)
- {
- DeRezObject(remoteClient, localID, groupID, action, destinationID);
- }
- }
-
- ///
- /// Called when an object is removed from the environment into inventory.
- ///
- ///
- ///
- ///
- ///
- ///
- public virtual void DeRezObject(IClientAPI remoteClient, uint localID,
- UUID groupID, DeRezAction action, UUID destinationID)
- {
- DeRezObjects(remoteClient, new List() { localID }, groupID, action, destinationID);
- }
-
public virtual void DeRezObjects(IClientAPI remoteClient, List localIDs,
UUID groupID, DeRezAction action, UUID destinationID)
{
@@ -1990,14 +1959,19 @@ namespace OpenSim.Region.Framework.Scenes
return group;
}
- public virtual bool returnObjects(SceneObjectGroup[] returnobjects, UUID AgentId)
+ public virtual bool returnObjects(SceneObjectGroup[] returnobjects,
+ UUID AgentId)
{
+ List localIDs = new List();
+
foreach (SceneObjectGroup grp in returnobjects)
{
- AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return");
- DeRezObject(null, grp.RootPart.LocalId,
- grp.RootPart.GroupID, DeRezAction.Return, UUID.Zero);
+ AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition,
+ "parcel owner return");
+ localIDs.Add(grp.RootPart.LocalId);
}
+ DeRezObjects(null, localIDs, UUID.Zero, DeRezAction.Return,
+ UUID.Zero);
return true;
}
--
cgit v1.1