aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-04-05 22:25:00 +0100
committerJustin Clark-Casey (justincc)2011-04-05 22:25:00 +0100
commit2497962360258eb6cb1a78c7b4d5227d88eabb87 (patch)
tree053c37ce3b58819f32a2ad282b8d003158ad6174 /OpenSim/Region
parentproperly refresh object owner list when refresh button is hit on land parcel ... (diff)
downloadopensim-SC-2497962360258eb6cb1a78c7b4d5227d88eabb87.zip
opensim-SC-2497962360258eb6cb1a78c7b4d5227d88eabb87.tar.gz
opensim-SC-2497962360258eb6cb1a78c7b4d5227d88eabb87.tar.bz2
opensim-SC-2497962360258eb6cb1a78c7b4d5227d88eabb87.tar.xz
Change some text to make the autoreturn mechanism more obvious, and align with the fact that it's one word rather than two.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
2 files changed, 8 insertions, 3 deletions
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