From d188ed8ed86661a79b68f5c43ce0a94dc51308f0 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 26 Jun 2010 13:07:17 -0700
Subject: [PATCH] Return everything at once, it's more efficient that way

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index abc7377730..bbac9191c2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2191,6 +2191,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void DeleteAllSceneObjects(bool exceptNoCopy)
         {
+            List<SceneObjectGroup> toReturn = new List<SceneObjectGroup>();
             lock (Entities)
             {
                 ICollection<EntityBase> entities = new List<EntityBase>(Entities);
@@ -2208,12 +2209,16 @@ namespace OpenSim.Region.Framework.Scenes
                             }
                             else
                             {
-                                DeRezObject(null, sog.RootPart.LocalId, sog.RootPart.GroupID, DeRezAction.Return, UUID.Zero);
+                                toReturn.Add((SceneObjectGroup)e);   
                             }
                         }
                     }
                 }
             }
+            if (toReturn.Count > 0)
+            {
+                returnObjects(toReturn.ToArray(), UUID.Zero);
+            }
         }
 
         /// <summary>