aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-07-24 16:44:12 -0700
committerDiva Canto2013-07-24 16:44:12 -0700
commitf5343e4b0730bb822fbc4e6ffbdd002d5b041114 (patch)
treed341f7d92bfc143d48c31df781c3a7fba4d94be6
parentBulletSim: remove unused reference to BulletXNA in prebuild.xml. (diff)
downloadopensim-SC_OLD-f5343e4b0730bb822fbc4e6ffbdd002d5b041114.zip
opensim-SC_OLD-f5343e4b0730bb822fbc4e6ffbdd002d5b041114.tar.gz
opensim-SC_OLD-f5343e4b0730bb822fbc4e6ffbdd002d5b041114.tar.bz2
opensim-SC_OLD-f5343e4b0730bb822fbc4e6ffbdd002d5b041114.tar.xz
Committing the same fix here for the infinity problem on TPs.
-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 3cb1901..6ff8da8 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(2000); 667 Thread.Sleep(15000);
668 668
669 sp.Scene.IncomingCloseAgent(sp.UUID, false); 669 sp.Scene.IncomingCloseAgent(sp.UUID, false);
670 } 670 }