aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-03-22 01:06:56 +0000
committerJustin Clark-Casey (justincc)2013-03-22 01:06:56 +0000
commit1f17ef6d3ce8d3db22d4179cbbc1aee3503610ea (patch)
treee4bc3e2106a37b2b2210c2a073719dd3ddc720ee /OpenSim/Region/CoreModules/Framework/EntityTransfer
parentAt strategic points in the teleport process, if the client has simultaneously... (diff)
downloadopensim-SC_OLD-1f17ef6d3ce8d3db22d4179cbbc1aee3503610ea.zip
opensim-SC_OLD-1f17ef6d3ce8d3db22d4179cbbc1aee3503610ea.tar.gz
opensim-SC_OLD-1f17ef6d3ce8d3db22d4179cbbc1aee3503610ea.tar.bz2
opensim-SC_OLD-1f17ef6d3ce8d3db22d4179cbbc1aee3503610ea.tar.xz
Take out a testing sleep I accidentally left in the teleport code from last commit 7471bc7
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 5713e88..26267e2 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -604,8 +604,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
604 return; 604 return;
605 } 605 }
606 606
607 Thread.Sleep(30000);
608
609 if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Cancelling) 607 if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Cancelling)
610 { 608 {
611 m_log.DebugFormat( 609 m_log.DebugFormat(