diff options
author | UbitUmarov | 2014-08-24 02:23:00 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-24 02:23:00 +0100 |
commit | 094d8686e597e573dd799e319f1bb3d3397bf38a (patch) | |
tree | 2a0eb5147093a2c642a7a923dc0228a2d95564bd /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | *test* move sending kills to before sending the update, this breaks tp (diff) | |
download | opensim-SC-094d8686e597e573dd799e319f1bb3d3397bf38a.zip opensim-SC-094d8686e597e573dd799e319f1bb3d3397bf38a.tar.gz opensim-SC-094d8686e597e573dd799e319f1bb3d3397bf38a.tar.bz2 opensim-SC-094d8686e597e573dd799e319f1bb3d3397bf38a.tar.xz |
put back the kills on tp where they belong
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index d8fab4b..37aae08 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1115,8 +1115,6 @@ 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 | |||
1120 | // Send the Update. If this returns true, we know the client has contacted the destination | 1118 | // Send the Update. If this returns true, we know the client has contacted the destination |
1121 | // via CompleteMovementIntoRegion, so we can let go. | 1119 | // via CompleteMovementIntoRegion, so we can let go. |
1122 | // If it returns false, something went wrong, and we need to abort. | 1120 | // If it returns false, something went wrong, and we need to abort. |
@@ -1143,7 +1141,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1143 | 1141 | ||
1144 | m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp); | 1142 | m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp); |
1145 | 1143 | ||
1146 | // sp.HasMovedAway(); | 1144 | sp.HasMovedAway(); |
1147 | 1145 | ||
1148 | // Need to signal neighbours whether child agents may need closing irrespective of whether this | 1146 | // Need to signal neighbours whether child agents may need closing irrespective of whether this |
1149 | // one needed closing. We also need to close child agents as quickly as possible to avoid complicated | 1147 | // one needed closing. We also need to close child agents as quickly as possible to avoid complicated |
@@ -1153,10 +1151,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1153 | // abandoned without proper close by viewer but then re-used by an incoming connection. | 1151 | // abandoned without proper close by viewer but then re-used by an incoming connection. |
1154 | sp.CloseChildAgents(newRegionX, newRegionY); | 1152 | sp.CloseChildAgents(newRegionX, newRegionY); |
1155 | 1153 | ||
1156 | // May need to logout or other cleanup | ||
1157 | // AgentHasMovedAway(sp, logout); | ||
1158 | // AgentHasMovedAway(sp, true); | 1154 | // AgentHasMovedAway(sp, true); |
1159 | |||
1160 | // Well, this is it. The agent is over there. | 1155 | // Well, this is it. The agent is over there. |
1161 | // KillEntity(sp.Scene, sp.LocalId); | 1156 | // KillEntity(sp.Scene, sp.LocalId); |
1162 | 1157 | ||