Merge branch '0.7.5-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7.5-post-fixes

2013-07-26 16:00:16 -07:00 · 2013-07-26 16:00:16 -07:00 · 98b65bd5f4
parent 0e772c6516 2c54659ca8
commit 98b65bd5f4
1 changed files with 1 additions and 1 deletions
--- 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);
            }