From 16d8602d3cad613a830a4903bb0d2beb1fa6b7e2 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 1 Jun 2010 03:04:49 +0200
Subject: Fix prim returns I broke earlier
---
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 11 +++++++----
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index e1128a6..e111867 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1637,11 +1637,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
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 4203ba9..7e73f91 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -801,7 +801,7 @@ namespace OpenSim.Region.Framework.Scenes
maxZ = -256f;
minX = 256f;
minY = 256f;
- minZ = 256f;
+ minZ = 8192f;
lockPartsForRead(true);
{
--
cgit v1.1