diff options
author | UbitUmarov | 2014-08-24 01:04:32 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-24 01:04:32 +0100 |
commit | d5814ccf650d4873d66e3978bf2bf70d9fbfbfaf (patch) | |
tree | ffcb206487b9f1365f4a6852c4fd0d55b1483f8b /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | clean sendKill a bit, remove a IsChild that is set too early in a calling (diff) | |
download | opensim-SC-d5814ccf650d4873d66e3978bf2bf70d9fbfbfaf.zip opensim-SC-d5814ccf650d4873d66e3978bf2bf70d9fbfbfaf.tar.gz opensim-SC-d5814ccf650d4873d66e3978bf2bf70d9fbfbfaf.tar.bz2 opensim-SC-d5814ccf650d4873d66e3978bf2bf70d9fbfbfaf.tar.xz |
*test* move sending kills to before sending the update, this breaks tp
abort
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 781fc40..d8fab4b 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1115,6 +1115,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1115 | // in no close. | 1115 | // in no close. |
1116 | sp.DoNotCloseAfterTeleport = false; | 1116 | sp.DoNotCloseAfterTeleport = false; |
1117 | 1117 | ||
1118 | sp.HasMovedAway(); | ||
1119 | |||
1118 | // Send the Update. If this returns true, we know the client has contacted the destination | 1120 | // Send the Update. If this returns true, we know the client has contacted the destination |
1119 | // via CompleteMovementIntoRegion, so we can let go. | 1121 | // via CompleteMovementIntoRegion, so we can let go. |
1120 | // If it returns false, something went wrong, and we need to abort. | 1122 | // If it returns false, something went wrong, and we need to abort. |
@@ -1141,6 +1143,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1141 | 1143 | ||
1142 | m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp); | 1144 | m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp); |
1143 | 1145 | ||
1146 | // sp.HasMovedAway(); | ||
1147 | |||
1144 | // Need to signal neighbours whether child agents may need closing irrespective of whether this | 1148 | // Need to signal neighbours whether child agents may need closing irrespective of whether this |
1145 | // one needed closing. We also need to close child agents as quickly as possible to avoid complicated | 1149 | // one needed closing. We also need to close child agents as quickly as possible to avoid complicated |
1146 | // race conditions with rapid agent releporting (e.g. from A1 to a non-neighbour B, back | 1150 | // 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 | |||
1149 | // abandoned without proper close by viewer but then re-used by an incoming connection. | 1153 | // abandoned without proper close by viewer but then re-used by an incoming connection. |
1150 | sp.CloseChildAgents(newRegionX, newRegionY); | 1154 | sp.CloseChildAgents(newRegionX, newRegionY); |
1151 | 1155 | ||
1152 | sp.HasMovedAway(); | ||
1153 | // May need to logout or other cleanup | 1156 | // May need to logout or other cleanup |
1154 | // AgentHasMovedAway(sp, logout); | 1157 | // AgentHasMovedAway(sp, logout); |
1155 | // AgentHasMovedAway(sp, true); | 1158 | // AgentHasMovedAway(sp, true); |