diff options
author | Diva Canto | 2013-07-24 12:54:13 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-24 14:31:03 -0700 |
commit | 46d017b19745ccdd5948865de53375a814bf2659 (patch) | |
tree | e21ba4145e6fa7689733f065272a831ce904e3a7 /OpenSim/Region/CoreModules/Framework | |
parent | Moved TriggerOnMakeRootAgent back to the end of MakeRootAgent, to see if that... (diff) | |
download | opensim-SC_OLD-46d017b19745ccdd5948865de53375a814bf2659.zip opensim-SC_OLD-46d017b19745ccdd5948865de53375a814bf2659.tar.gz opensim-SC_OLD-46d017b19745ccdd5948865de53375a814bf2659.tar.bz2 opensim-SC_OLD-46d017b19745ccdd5948865de53375a814bf2659.tar.xz |
Today's wild shot at the infinity problem. Wait on the child agent left behind.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 22b577b..29ba5f8 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1047,7 +1047,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1047 | // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone | 1047 | // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone |
1048 | 1048 | ||
1049 | if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) | 1049 | if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) |
1050 | { | ||
1051 | Thread.Sleep(5000); | ||
1050 | sp.Scene.IncomingCloseAgent(sp.UUID, false); | 1052 | sp.Scene.IncomingCloseAgent(sp.UUID, false); |
1053 | } | ||
1051 | else | 1054 | else |
1052 | // now we have a child agent in this region. | 1055 | // now we have a child agent in this region. |
1053 | sp.Reset(); | 1056 | sp.Reset(); |
@@ -1064,7 +1067,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1064 | /// <param name='finalDestination'></param> | 1067 | /// <param name='finalDestination'></param> |
1065 | protected virtual void CleanupFailedInterRegionTeleport(ScenePresence sp, string auth_token, GridRegion finalDestination) | 1068 | protected virtual void CleanupFailedInterRegionTeleport(ScenePresence sp, string auth_token, GridRegion finalDestination) |
1066 | { | 1069 | { |
1067 | m_log.DebugFormat("[ZZZ]: FAIL!"); | ||
1068 | m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp); | 1070 | m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp); |
1069 | 1071 | ||
1070 | if (sp.IsChildAgent) // We had set it to child before attempted TP (V1) | 1072 | if (sp.IsChildAgent) // We had set it to child before attempted TP (V1) |