From 9a5d0984a5d4d416cf2e8560648aa94de916ad20 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 7 Oct 2010 02:16:36 +0100
Subject: Fix autoreturn to not return zero objects

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index f7a304f..5f00f84 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1291,8 +1291,6 @@ 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)
                     {
@@ -1306,15 +1304,13 @@ 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");
-                                returns.Add(RootPart.LocalId);
+                                m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero,
+                                        DeRezAction.Return, UUID.Zero);
 
                                 return;
                             }
                         }
                     }
-
-                    m_scene.DeRezObjects(null, returns, UUID.Zero,
-                            DeRezAction.Return, UUID.Zero);
                 }
 
                 if (HasGroupChanged)
-- 
cgit v1.1