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

old tp timing issues on grid presence notification did came back, so put back old hack

0.9.1.0-post-fixes
UbitUmarov 2019-04-09 10:22:55 +01:00
parent 2c8e03b589
commit f29fdb6bda
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1147,11 +1147,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// in no close. // in no close.
sp.DoNotCloseAfterTeleport = false; sp.DoNotCloseAfterTeleport = false;
// we still need to flag this as child here
// a close from receiving region seems possible to happen before we reach sp.MakeChildAgent below
// causing the agent to be loggout out from grid incorrectly
sp.IsChildAgent = true;
// Send the Update. If this returns true, we know the client has contacted the destination // Send the Update. If this returns true, we know the client has contacted the destination
// via CompleteMovementIntoRegion, so we can let go. // via CompleteMovementIntoRegion, so we can let go.
// If it returns false, something went wrong, and we need to abort. // If it returns false, something went wrong, and we need to abort.
if (!UpdateAgent(reg, finalDestination, agent, sp, ctx)) if (!UpdateAgent(reg, finalDestination, agent, sp, ctx))
{ {
sp.IsChildAgent = false;
if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting) if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting)
{ {
m_interRegionTeleportAborts.Value++; m_interRegionTeleportAborts.Value++;