From 2c54659ca837bf8b3745ea6032df37e242d15b87 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Fri, 26 Jul 2013 01:44:48 +0100 Subject: [PATCH] Revert "Committing the same fix here for the infinity problem on TPs." This reverts commit f5343e4b0730bb822fbc4e6ffbdd002d5b041114. This is because a returning viewer by teleport before 15 seconds are up will be disrupted by the close and so is a significant behaviour change Development along the longer delay lines will continue in dev code --- .../Framework/EntityTransfer/EntityTransferModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 6ff8da89a7..3cb1901494 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -664,7 +664,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer // // This sleep can be increased if necessary. However, whilst it's active, // an agent cannot teleport back to this region if it has teleported away. - Thread.Sleep(15000); + Thread.Sleep(2000); sp.Scene.IncomingCloseAgent(sp.UUID, false); }