diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index f7a304f..5f00f84 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1291,8 +1291,6 @@ 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 | |||
1296 | if (parcel != null && parcel.LandData != null && | 1294 | if (parcel != null && parcel.LandData != null && |
1297 | parcel.LandData.OtherCleanTime != 0) | 1295 | parcel.LandData.OtherCleanTime != 0) |
1298 | { | 1296 | { |
@@ -1306,15 +1304,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
1306 | DetachFromBackup(); | 1304 | DetachFromBackup(); |
1307 | m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); | 1305 | m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); |
1308 | m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return"); | 1306 | m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return"); |
1309 | returns.Add(RootPart.LocalId); | 1307 | m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero, |
1308 | DeRezAction.Return, UUID.Zero); | ||
1310 | 1309 | ||
1311 | return; | 1310 | return; |
1312 | } | 1311 | } |
1313 | } | 1312 | } |
1314 | } | 1313 | } |
1315 | |||
1316 | m_scene.DeRezObjects(null, returns, UUID.Zero, | ||
1317 | DeRezAction.Return, UUID.Zero); | ||
1318 | } | 1314 | } |
1319 | 1315 | ||
1320 | if (HasGroupChanged) | 1316 | if (HasGroupChanged) |