aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index a6d89cf..9a7d560 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1569,8 +1569,6 @@ namespace OpenSim.Region.Framework.Scenes
1569 ILandObject parcel = m_scene.LandChannel.GetLandObject( 1569 ILandObject parcel = m_scene.LandChannel.GetLandObject(
1570 m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y); 1570 m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
1571 1571
1572 List<uint> returns = new List<uint>();
1573
1574 if (parcel != null && parcel.LandData != null && 1572 if (parcel != null && parcel.LandData != null &&
1575 parcel.LandData.OtherCleanTime != 0) 1573 parcel.LandData.OtherCleanTime != 0)
1576 { 1574 {
@@ -1584,15 +1582,14 @@ namespace OpenSim.Region.Framework.Scenes
1584 DetachFromBackup(); 1582 DetachFromBackup();
1585 m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); 1583 m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString());
1586 m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return"); 1584 m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return");
1587 returns.Add(RootPart.LocalId); 1585 m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero,
1586 DeRezAction.Return, UUID.Zero);
1588 1587
1589 return; 1588 return;
1590 } 1589 }
1591 } 1590 }
1592 } 1591 }
1593 1592
1594 m_scene.DeRezObjects(null, returns, UUID.Zero,
1595 DeRezAction.Return, UUID.Zero);
1596 } 1593 }
1597 1594
1598 if (HasGroupChanged) 1595 if (HasGroupChanged)