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.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index a00a7c4..a6d89cf 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1569,6 +1569,8 @@ 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
1572 if (parcel != null && parcel.LandData != null && 1574 if (parcel != null && parcel.LandData != null &&
1573 parcel.LandData.OtherCleanTime != 0) 1575 parcel.LandData.OtherCleanTime != 0)
1574 { 1576 {
@@ -1582,13 +1584,15 @@ namespace OpenSim.Region.Framework.Scenes
1582 DetachFromBackup(); 1584 DetachFromBackup();
1583 m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); 1585 m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString());
1584 m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return"); 1586 m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return");
1585 m_scene.DeRezObject(null, RootPart.LocalId, 1587 returns.Add(RootPart.LocalId);
1586 RootPart.GroupID, DeRezAction.Return, UUID.Zero);
1587 1588
1588 return; 1589 return;
1589 } 1590 }
1590 } 1591 }
1591 } 1592 }
1593
1594 m_scene.DeRezObjects(null, returns, UUID.Zero,
1595 DeRezAction.Return, UUID.Zero);
1592 } 1596 }
1593 1597
1594 if (HasGroupChanged) 1598 if (HasGroupChanged)