From e89bcf4f773d95492b168376599f7530a6044e8f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 29 Mar 2013 01:34:31 +0000
Subject: Revert "Try eliminating the pause before auto-reteleporting for a
 megaregion now that we're telepoting in a different way."

Unfortunately fails on Nebadon's system right now.  Needs investigation.  May put in a temproary option for experimentation soon.

This reverts commit d87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba.
---
 .../Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 495b0a0..764c982 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1348,7 +1348,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}", 
-- 
cgit v1.1