Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminster

2013-03-29 02:20:47 +00:00 · 2013-03-29 02:20:47 +00:00 · 7d466d36a3
parent e7d76c91c2 d87ddf50fc
commit 7d466d36a3
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
@ -1307,7 +1307,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
        public void InformClientToInitiateTeleportToLocationAsync(ScenePresence agent, uint regionX, uint regionY, Vector3 position,
            Scene initiatingScene)
        {
-            Thread.Sleep(10000);
+//            Thread.Sleep(10000);

            m_log.DebugFormat(
                "[ENTITY TRANSFER MODULE]: Auto-reteleporting {0} to correct megaregion location {1},{2},{3} from {4}",