diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 8ce6bb4..3f1686c 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -916,13 +916,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
916 | 916 | ||
917 | if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) | 917 | if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) |
918 | { | 918 | { |
919 | // RED ALERT!!!! | 919 | // We need to delay here because Imprudence viewers, unlike v1 or v3, have a short (<200ms, <500ms) delay before |
920 | // PLEASE DO NOT DECREASE THIS WAIT TIME UNDER ANY CIRCUMSTANCES. | 920 | // they regard the new region as the current region after receiving the AgentMovementComplete |
921 | // THE VIEWERS SEEM TO NEED SOME TIME AFTER RECEIVING MoveAgentIntoRegion | 921 | // response. If close is sent before then, it will cause the viewer to quit instead. |
922 | // BEFORE THEY SETTLE IN THE NEW REGION. | 922 | // |
923 | // DECREASING THE WAIT TIME HERE WILL EITHER RESULT IN A VIEWER CRASH OR | 923 | // This sleep can be increased if necessary. However, whilst it's active, |
924 | // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS. | 924 | // an agent cannot teleport back to this region if it has teleported away. |
925 | Thread.Sleep(15000); | 925 | Thread.Sleep(2000); |
926 | 926 | ||
927 | sp.Scene.IncomingCloseAgent(sp.UUID, false); | 927 | sp.Scene.IncomingCloseAgent(sp.UUID, false); |
928 | } | 928 | } |