From a5728cc91c6737e6abef75c4b1da2f78a8317d84 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Tue, 1 Jun 2010 03:04:49 +0200
Subject: [PATCH] Fix prim returns I broke earlier
---
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index bad92a00cd..cc7b6485f7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1618,11 +1618,14 @@ namespace OpenSim.Region.Framework.Scenes
null,
remoteClient.AgentId,
deleteGroups))
- foreach (SceneObjectGroup g in deleteGroups)
{
- AddReturn(g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return");
- DeleteSceneObject(g, false);
- return;
+ permissionToTake = true;
+ permissionToDelete = true;
+
+ foreach (SceneObjectGroup g in deleteGroups)
+ {
+ AddReturn(g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return");
+ }
}
}
else // Auto return passes through here with null agent