Plumb the path for multiple object deletes

1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index a00a7c4..a6d89cf 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1569,6 +1569,8 @@ namespace OpenSim.Region.Framework.Scenes
                     ILandObject parcel = m_scene.LandChannel.GetLandObject(
                             m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
 
+                    List<uint> returns = new List<uint>();
+
                     if (parcel != null && parcel.LandData != null &&
                             parcel.LandData.OtherCleanTime != 0)
                     {
@@ -1582,13 +1584,15 @@ namespace OpenSim.Region.Framework.Scenes
                                 DetachFromBackup();
                                 m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString());
                                 m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return");
-                                m_scene.DeRezObject(null, RootPart.LocalId,
-                                    RootPart.GroupID, DeRezAction.Return, UUID.Zero);
+                                returns.Add(RootPart.LocalId);
 
                                 return;
                             }
                         }
                     }
+
+                    m_scene.DeRezObjects(null, returns, UUID.Zero,
+                            DeRezAction.Return, UUID.Zero);
                 }
 
                 if (HasGroupChanged)