diff options
| author | Melanie | 2013-03-29 02:20:47 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-29 02:20:47 +0000 |
| commit | 7d466d36a394716c33cdd2496f8945894f4a635c (patch) | |
| tree | 053e602ab2b27caa22b0d95e4e517e389967681c /OpenSim/Region | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Try eliminating the pause before auto-reteleporting for a megaregion now that... (diff) | |
| download | opensim-SC-7d466d36a394716c33cdd2496f8945894f4a635c.zip opensim-SC-7d466d36a394716c33cdd2496f8945894f4a635c.tar.gz opensim-SC-7d466d36a394716c33cdd2496f8945894f4a635c.tar.bz2 opensim-SC-7d466d36a394716c33cdd2496f8945894f4a635c.tar.xz | |
Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminster
Diffstat (limited to 'OpenSim/Region')
| -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 8082c1b..dedf1af 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}", |