diff options
author | Justin Clark-Casey (justincc) | 2012-05-01 23:14:12 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-01 23:14:12 +0100 |
commit | 9d2e1c67a8969e4769006c7347505b58a7827b3f (patch) | |
tree | 1fb6d412e2d8a753e1b59af46f6ada0a45556e75 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Move max teleport distance check down into etm.DoTeleport() since this should... (diff) | |
download | opensim-SC-9d2e1c67a8969e4769006c7347505b58a7827b3f.zip opensim-SC-9d2e1c67a8969e4769006c7347505b58a7827b3f.tar.gz opensim-SC-9d2e1c67a8969e4769006c7347505b58a7827b3f.tar.bz2 opensim-SC-9d2e1c67a8969e4769006c7347505b58a7827b3f.tar.xz |
Add regression test for teleporting between neighbouring regions on the same simulator
This adds a non-advertised wait_for_callback option in [EntityTransfer]. Default is always true.
Teleport tests disable the wait for callback from the destination region in order to run within a single thread.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index f1d0926..e5a9a99 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2895,8 +2895,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2895 | x = x / Constants.RegionSize; | 2895 | x = x / Constants.RegionSize; |
2896 | y = y / Constants.RegionSize; | 2896 | y = y / Constants.RegionSize; |
2897 | 2897 | ||
2898 | //m_log.Debug("---> x: " + x + "; newx:" + newRegionX + "; Abs:" + (int)Math.Abs((int)(x - newRegionX))); | 2898 | // m_log.Debug("---> x: " + x + "; newx:" + newRegionX + "; Abs:" + (int)Math.Abs((int)(x - newRegionX))); |
2899 | //m_log.Debug("---> y: " + y + "; newy:" + newRegionY + "; Abs:" + (int)Math.Abs((int)(y - newRegionY))); | 2899 | // m_log.Debug("---> y: " + y + "; newy:" + newRegionY + "; Abs:" + (int)Math.Abs((int)(y - newRegionY))); |
2900 | if (Util.IsOutsideView(DrawDistance, x, newRegionX, y, newRegionY)) | 2900 | if (Util.IsOutsideView(DrawDistance, x, newRegionX, y, newRegionY)) |
2901 | { | 2901 | { |
2902 | byebyeRegions.Add(handle); | 2902 | byebyeRegions.Add(handle); |