Reset DoNotClose scene presence teleport flag before pausing. Rename DoNotClose to DoNotCloseAfterTeleport
parent
1fabdcc43c
commit
72ed49af5f
|
@ -1047,6 +1047,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
|
|||
|
||||
if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
|
||||
{
|
||||
sp.DoNotCloseAfterTeleport = false;
|
||||
|
||||
// RED ALERT!!!!
|
||||
// PLEASE DO NOT DECREASE THIS WAIT TIME UNDER ANY CIRCUMSTANCES.
|
||||
// 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.
|
||||
Thread.Sleep(15000);
|
||||
|
||||
if (!sp.DoNotClose)
|
||||
if (!sp.DoNotCloseAfterTeleport)
|
||||
{
|
||||
sp.Scene.IncomingCloseAgent(sp.UUID, false);
|
||||
}
|
||||
else
|
||||
{
|
||||
sp.DoNotClose = false;
|
||||
sp.DoNotCloseAfterTeleport = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
@ -3700,7 +3700,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
else
|
||||
{
|
||||
sp.DoNotClose = true;
|
||||
sp.DoNotCloseAfterTeleport = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -722,7 +722,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
/// teleport is reusing the connection.
|
||||
/// </summary>
|
||||
/// <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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue