aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-07-26 01:44:48 +0100
committerJustin Clark-Casey (justincc)2013-07-26 01:44:48 +0100
commit2c54659ca837bf8b3745ea6032df37e242d15b87 (patch)
tree1419e8760fa595bc5b49c4857e39515a6670700c /OpenSim
parentCommitting the same fix here for the infinity problem on TPs. (diff)
downloadopensim-SC_OLD-2c54659ca837bf8b3745ea6032df37e242d15b87.zip
opensim-SC_OLD-2c54659ca837bf8b3745ea6032df37e242d15b87.tar.gz
opensim-SC_OLD-2c54659ca837bf8b3745ea6032df37e242d15b87.tar.bz2
opensim-SC_OLD-2c54659ca837bf8b3745ea6032df37e242d15b87.tar.xz
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
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 6ff8da8..3cb1901 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
664 // 664 //
665 // This sleep can be increased if necessary. However, whilst it's active, 665 // This sleep can be increased if necessary. However, whilst it's active,
666 // an agent cannot teleport back to this region if it has teleported away. 666 // an agent cannot teleport back to this region if it has teleported away.
667 Thread.Sleep(15000); 667 Thread.Sleep(2000);
668 668
669 sp.Scene.IncomingCloseAgent(sp.UUID, false); 669 sp.Scene.IncomingCloseAgent(sp.UUID, false);
670 } 670 }