diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
2 files changed, 8 insertions, 5 deletions
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 | |||
1637 | null, | 1637 | null, |
1638 | remoteClient.AgentId, | 1638 | remoteClient.AgentId, |
1639 | deleteGroups)) | 1639 | deleteGroups)) |
1640 | foreach (SceneObjectGroup g in deleteGroups) | ||
1641 | { | 1640 | { |
1642 | AddReturn(g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return"); | 1641 | permissionToTake = true; |
1643 | DeleteSceneObject(g, false); | 1642 | permissionToDelete = true; |
1644 | return; | 1643 | |
1644 | foreach (SceneObjectGroup g in deleteGroups) | ||
1645 | { | ||
1646 | AddReturn(g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return"); | ||
1647 | } | ||
1645 | } | 1648 | } |
1646 | } | 1649 | } |
1647 | else // Auto return passes through here with null agent | 1650 | 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 | |||
801 | maxZ = -256f; | 801 | maxZ = -256f; |
802 | minX = 256f; | 802 | minX = 256f; |
803 | minY = 256f; | 803 | minY = 256f; |
804 | minZ = 256f; | 804 | minZ = 8192f; |
805 | 805 | ||
806 | lockPartsForRead(true); | 806 | lockPartsForRead(true); |
807 | { | 807 | { |