diff options
-rw-r--r-- | OpenSim/Framework/LandData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 145ccdd..c107143 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
@@ -560,7 +560,7 @@ namespace OpenSim.Framework | |||
560 | } | 560 | } |
561 | 561 | ||
562 | /// <summary> | 562 | /// <summary> |
563 | /// Number of minutes to return SceneObjectGroup that are owned by someone who doesn't own | 563 | /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own |
564 | /// the parcel and isn't set to the same 'group' as the parcel. | 564 | /// the parcel and isn't set to the same 'group' as the parcel. |
565 | /// </summary> | 565 | /// </summary> |
566 | public int OtherCleanTime { | 566 | public int OtherCleanTime { |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index a62d6d7..f0acc38 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1521,8 +1521,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1521 | } | 1521 | } |
1522 | 1522 | ||
1523 | /// <summary> | 1523 | /// <summary> |
1524 | /// Return object to avatar Message | 1524 | /// Tell an agent that their object has been returned. |
1525 | /// </summary> | 1525 | /// </summary> |
1526 | /// <remarks> | ||
1527 | /// The actual return is handled by the caller. | ||
1528 | /// </remarks> | ||
1526 | /// <param name="agentID">Avatar Unique Id</param> | 1529 | /// <param name="agentID">Avatar Unique Id</param> |
1527 | /// <param name="objectName">Name of object returned</param> | 1530 | /// <param name="objectName">Name of object returned</param> |
1528 | /// <param name="location">Location of object returned</param> | 1531 | /// <param name="location">Location of object returned</param> |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index f17fb28..a7107f0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1313,8 +1313,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1313 | parcel.LandData.OtherCleanTime) | 1313 | parcel.LandData.OtherCleanTime) |
1314 | { | 1314 | { |
1315 | DetachFromBackup(); | 1315 | DetachFromBackup(); |
1316 | m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); | 1316 | m_log.DebugFormat( |
1317 | m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return"); | 1317 | "[SCENE OBJECT GROUP]: Returning object {0} due to parcel autoreturn", |
1318 | RootPart.UUID); | ||
1319 | m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel autoreturn"); | ||
1318 | m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero, | 1320 | m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero, |
1319 | DeRezAction.Return, UUID.Zero); | 1321 | DeRezAction.Return, UUID.Zero); |
1320 | 1322 | ||