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

*test* move sending kills to before sending the update, this breaks tp 

abort
avinationmerge
UbitUmarov 2014-08-24 01:04:32 +01:00
parent f4a6be8654
commit d5814ccf65
1 changed files with 4 additions and 1 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

@ -1115,6 +1115,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// in no close. // in no close.
sp.DoNotCloseAfterTeleport = false; sp.DoNotCloseAfterTeleport = false;
sp.HasMovedAway();
// 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.
@ -1141,6 +1143,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp); m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp);
// sp.HasMovedAway();
// Need to signal neighbours whether child agents may need closing irrespective of whether this // Need to signal neighbours whether child agents may need closing irrespective of whether this
// one needed closing. We also need to close child agents as quickly as possible to avoid complicated // one needed closing. We also need to close child agents as quickly as possible to avoid complicated
// race conditions with rapid agent releporting (e.g. from A1 to a non-neighbour B, back // race conditions with rapid agent releporting (e.g. from A1 to a non-neighbour B, back
@ -1149,7 +1153,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// abandoned without proper close by viewer but then re-used by an incoming connection. // abandoned without proper close by viewer but then re-used by an incoming connection.
sp.CloseChildAgents(newRegionX, newRegionY); sp.CloseChildAgents(newRegionX, newRegionY);
sp.HasMovedAway();
// May need to logout or other cleanup // May need to logout or other cleanup
// AgentHasMovedAway(sp, logout); // AgentHasMovedAway(sp, logout);
// AgentHasMovedAway(sp, true); // AgentHasMovedAway(sp, true);