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 5513584..f7a304f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1291,6 +1291,8 @@ namespace OpenSim.Region.Framework.Scenes
1291 ILandObject parcel = m_scene.LandChannel.GetLandObject( 1291 ILandObject parcel = m_scene.LandChannel.GetLandObject(
1292 m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y); 1292 m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
1293 1293
1294 List<uint> returns = new List<uint>();
1295
1294 if (parcel != null && parcel.LandData != null && 1296 if (parcel != null && parcel.LandData != null &&
1295 parcel.LandData.OtherCleanTime != 0) 1297 parcel.LandData.OtherCleanTime != 0)
1296 { 1298 {
@@ -1304,13 +1306,15 @@ namespace OpenSim.Region.Framework.Scenes
1304 DetachFromBackup(); 1306 DetachFromBackup();
1305 m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); 1307 m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString());
1306 m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return"); 1308 m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return");
1307 m_scene.DeRezObject(null, RootPart.LocalId, 1309 returns.Add(RootPart.LocalId);
1308 RootPart.GroupID, DeRezAction.Return, UUID.Zero);
1309 1310
1310 return; 1311 return;
1311 } 1312 }
1312 } 1313 }
1313 } 1314 }
1315
1316 m_scene.DeRezObjects(null, returns, UUID.Zero,
1317 DeRezAction.Return, UUID.Zero);
1314 } 1318 }
1315 1319
1316 if (HasGroupChanged) 1320 if (HasGroupChanged)