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

Reset DoNotClose scene presence teleport flag before pausing. Rename DoNotClose to DoNotCloseAfterTeleport

TeleportWork
Justin Clark-Casey (justincc) 2013-07-26 01:38:04 +01:00
parent 1fabdcc43c
commit 72ed49af5f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -1047,6 +1047,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
{ {
sp.DoNotCloseAfterTeleport = false;
// RED ALERT!!!! // RED ALERT!!!!
// PLEASE DO NOT DECREASE THIS WAIT TIME UNDER ANY CIRCUMSTANCES. // PLEASE DO NOT DECREASE THIS WAIT TIME UNDER ANY CIRCUMSTANCES.
// THE VIEWERS SEEM TO NEED SOME TIME AFTER RECEIVING MoveAgentIntoRegion // THE VIEWERS SEEM TO NEED SOME TIME AFTER RECEIVING MoveAgentIntoRegion
@ -1055,13 +1057,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS. // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS.
Thread.Sleep(15000); Thread.Sleep(15000);
if (!sp.DoNotClose) if (!sp.DoNotCloseAfterTeleport)
{ {
sp.Scene.IncomingCloseAgent(sp.UUID, false); sp.Scene.IncomingCloseAgent(sp.UUID, false);
} }
else else
{ {
sp.DoNotClose = false; sp.DoNotCloseAfterTeleport = false;
} }
} }
else else

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

@ -3700,7 +3700,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
else else
{ {
sp.DoNotClose = true; sp.DoNotCloseAfterTeleport = true;
} }
} }

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -722,7 +722,7 @@ namespace OpenSim.Region.Framework.Scenes
/// teleport is reusing the connection. /// teleport is reusing the connection.
/// </summary> /// </summary>
/// <remarks>May be refactored or move somewhere else soon.</remarks> /// <remarks>May be refactored or move somewhere else soon.</remarks>
public bool DoNotClose { get; set; } public bool DoNotCloseAfterTeleport { get; set; }
private float m_speedModifier = 1.0f; private float m_speedModifier = 1.0f;