Merge commit 'e89bcf4f773d95492b168376599f7530a6044e8f' into careminster

author: Melanie 2013-03-29 02:21:20 +0000
committer: Melanie 2013-03-29 02:21:20 +0000
commit: e9eb837347745f83eae2852717b7e3604f25b045 (patch)
tree: a6d1de47e3627896b1cc5432f1a6c04fd22a651a
parent: Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminster (diff)
parent: Revert "Try eliminating the pause before auto-reteleporting for a megaregion ... (diff)
download: opensim-SC_OLD-e9eb837347745f83eae2852717b7e3604f25b045.zip
opensim-SC_OLD-e9eb837347745f83eae2852717b7e3604f25b045.tar.gz
opensim-SC_OLD-e9eb837347745f83eae2852717b7e3604f25b045.tar.bz2
opensim-SC_OLD-e9eb837347745f83eae2852717b7e3604f25b045.tar.xz
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 dedf1af..8082c1b 100644
--- 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}",
author	Melanie	2013-03-29 02:21:20 +0000
committer	Melanie	2013-03-29 02:21:20 +0000
commit	e9eb837347745f83eae2852717b7e3604f25b045 (patch)
tree	a6d1de47e3627896b1cc5432f1a6c04fd22a651a
parent	Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminster (diff)
parent	Revert "Try eliminating the pause before auto-reteleporting for a megaregion ... (diff)
download	opensim-SC_OLD-e9eb837347745f83eae2852717b7e3604f25b045.zip opensim-SC_OLD-e9eb837347745f83eae2852717b7e3604f25b045.tar.gz opensim-SC_OLD-e9eb837347745f83eae2852717b7e3604f25b045.tar.bz2 opensim-SC_OLD-e9eb837347745f83eae2852717b7e3604f25b045.tar.xz

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index dedf1af..8082c1b 100644 --- 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
1307	public void InformClientToInitiateTeleportToLocationAsync(ScenePresence agent, uint regionX, uint regionY, Vector3 position,	1307	public void InformClientToInitiateTeleportToLocationAsync(ScenePresence agent, uint regionX, uint regionY, Vector3 position,
1308	Scene initiatingScene)	1308	Scene initiatingScene)
1309	{	1309	{
1310	// Thread.Sleep(10000);	1310	Thread.Sleep(10000);
1311		1311
1312	m_log.DebugFormat(	1312	m_log.DebugFormat(
1313	"[ENTITY TRANSFER MODULE]: Auto-reteleporting {0} to correct megaregion location {1},{2},{3} from {4}",	1313	"[ENTITY TRANSFER MODULE]: Auto-reteleporting {0} to correct megaregion location {1},{2},{3} from {4}",