aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-03-29 01:16:29 +0000
committerJustin Clark-Casey (justincc)2013-03-29 01:16:29 +0000
commitd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba (patch)
tree04cb649b69acc7332f5c892b5928a5271c9269dc
parentEliminate code which tries to restart attachment scripts in ScenePresence.Mak... (diff)
downloadopensim-SC_OLD-d87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba.zip
opensim-SC_OLD-d87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba.tar.gz
opensim-SC_OLD-d87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba.tar.bz2
opensim-SC_OLD-d87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba.tar.xz
Try eliminating the pause before auto-reteleporting for a megaregion now that we're telepoting in a different way.
On my own system, I can now eliminate the pause entirely and the reteleport happens whilst the teleport screen is still up. Trying this change to see if this is true for other people.
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs2
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 764c982..495b0a0 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
1348 public void InformClientToInitiateTeleportToLocationAsync(ScenePresence agent, uint regionX, uint regionY, Vector3 position, 1348 public void InformClientToInitiateTeleportToLocationAsync(ScenePresence agent, uint regionX, uint regionY, Vector3 position,
1349 Scene initiatingScene) 1349 Scene initiatingScene)
1350 { 1350 {
1351 Thread.Sleep(10000); 1351// Thread.Sleep(10000);
1352 1352
1353 m_log.DebugFormat( 1353 m_log.DebugFormat(
1354 "[ENTITY TRANSFER MODULE]: Auto-reteleporting {0} to correct megaregion location {1},{2},{3} from {4}", 1354 "[ENTITY TRANSFER MODULE]: Auto-reteleporting {0} to correct megaregion location {1},{2},{3} from {4}",