OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change some text to make the autoreturn mechanism more obvious, and align with the fact that it's one word rather than two.

0.7.1-dev
Justin Clark-Casey (justincc) 2011-04-05 22:25:00 +01:00
parent acacee98c6
commit 2497962360
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/LandData.cs
View File

@ -560,7 +560,7 @@ namespace OpenSim.Framework
}
/// <summary>
/// Number of minutes to return SceneObjectGroup that are owned by someone who doesn't own
/// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own
/// the parcel and isn't set to the same 'group' as the parcel.
/// </summary>
public int OtherCleanTime {

5
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1521,8 +1521,11 @@ namespace OpenSim.Region.Framework.Scenes
}
/// <summary>
/// Return object to avatar Message
/// Tell an agent that their object has been returned.
/// </summary>
/// <remarks>
/// The actual return is handled by the caller.
/// </remarks>
/// <param name="agentID">Avatar Unique Id</param>
/// <param name="objectName">Name of object returned</param>
/// <param name="location">Location of object returned</param>

6
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -1313,8 +1313,10 @@ namespace OpenSim.Region.Framework.Scenes
parcel.LandData.OtherCleanTime)
{
DetachFromBackup();
m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString());
m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return");
m_log.DebugFormat(
"[SCENE OBJECT GROUP]: Returning object {0} due to parcel autoreturn",
RootPart.UUID);
m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel autoreturn");
m_scene.DeRezObjects(null, new List<uint>() { RootPart.LocalId }, UUID.Zero,
DeRezAction.Return, UUID.Zero);