diff options
| author | Justin Clark-Casey (justincc) | 2013-03-29 01:34:31 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-03-29 01:34:31 +0000 |
| commit | e89bcf4f773d95492b168376599f7530a6044e8f (patch) | |
| tree | f53495a34b28aa7b79a922f85abec859170aa61a /OpenSim/Region | |
| parent | Add Location (relative), Rotation (Relative) and Rotation (World) to "show pa... (diff) | |
| download | opensim-SC-e89bcf4f773d95492b168376599f7530a6044e8f.zip opensim-SC-e89bcf4f773d95492b168376599f7530a6044e8f.tar.gz opensim-SC-e89bcf4f773d95492b168376599f7530a6044e8f.tar.bz2 opensim-SC-e89bcf4f773d95492b168376599f7530a6044e8f.tar.xz | |
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.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 |
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 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 | |||
| 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}", |