diff options
author | Justin Clark-Casey (justincc) | 2012-04-25 01:51:40 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-25 01:51:40 +0100 |
commit | a65ca24701ac34415bf76f4d9094ab42ae721c9a (patch) | |
tree | d31e0c5934d58716b3d97440c8870c2c21eba569 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Comment out AvatarService.SetAvatar debug log line for now (diff) | |
download | opensim-SC_OLD-a65ca24701ac34415bf76f4d9094ab42ae721c9a.zip opensim-SC_OLD-a65ca24701ac34415bf76f4d9094ab42ae721c9a.tar.gz opensim-SC_OLD-a65ca24701ac34415bf76f4d9094ab42ae721c9a.tar.bz2 opensim-SC_OLD-a65ca24701ac34415bf76f4d9094ab42ae721c9a.tar.xz |
Add regression test TestSameRegionTeleport()
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index b5f789b..9005acd 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -990,6 +990,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
990 | /// <param name="pos"></param> | 990 | /// <param name="pos"></param> |
991 | public void Teleport(Vector3 pos) | 991 | public void Teleport(Vector3 pos) |
992 | { | 992 | { |
993 | // m_log.DebugFormat("[SCENE PRESENCE]: Moving {0} to {1} in {2}", Name, pos, Scene.RegionInfo.RegionName); | ||
994 | |||
993 | bool isFlying = Flying; | 995 | bool isFlying = Flying; |
994 | RemoveFromPhysicalScene(); | 996 | RemoveFromPhysicalScene(); |
995 | Velocity = Vector3.Zero; | 997 | Velocity = Vector3.Zero; |
@@ -1002,6 +1004,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1002 | 1004 | ||
1003 | public void TeleportWithMomentum(Vector3 pos) | 1005 | public void TeleportWithMomentum(Vector3 pos) |
1004 | { | 1006 | { |
1007 | // m_log.DebugFormat( | ||
1008 | // "[SCENE PRESENCE]: Moving {0} to {1} with existing momentum {2} in {3} ", | ||
1009 | // Name, pos, Velocity, Scene.RegionInfo.RegionName); | ||
1010 | |||
1005 | bool isFlying = Flying; | 1011 | bool isFlying = Flying; |
1006 | RemoveFromPhysicalScene(); | 1012 | RemoveFromPhysicalScene(); |
1007 | CheckLandingPoint(ref pos); | 1013 | CheckLandingPoint(ref pos); |