Merge commit 'e89bcf4f773d95492b168376599f7530a6044e8f' into careminster

2013-03-29 02:21:20 +00:00 · 2013-03-29 02:21:20 +00:00 · e9eb837347
parent 3696a668a8 e89bcf4f77
commit e9eb837347
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}",