aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTalun2012-05-07 21:44:17 +0100
committerJustin Clark-Casey (justincc)2012-05-09 00:02:13 +0100
commitc21c9e13ef09607fa6f918f27bf087247a70d5a3 (patch)
tree12c211f72390b77a3308700e180e23e84d80a6b9 /OpenSim/Region
parentAdd automated TestllBreakLink() (diff)
downloadopensim-SC_OLD-c21c9e13ef09607fa6f918f27bf087247a70d5a3.zip
opensim-SC_OLD-c21c9e13ef09607fa6f918f27bf087247a70d5a3.tar.gz
opensim-SC_OLD-c21c9e13ef09607fa6f918f27bf087247a70d5a3.tar.bz2
opensim-SC_OLD-c21c9e13ef09607fa6f918f27bf087247a70d5a3.tar.xz
Mantis 1456 same region teleport of a sitting avatar.
Region to region was fixed some time ago in EntityTransferModule. This applies the same fix for same region teleports.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7e49a5e..769824e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -996,6 +996,8 @@ namespace OpenSim.Region.Framework.Scenes
996 996
997 public void TeleportWithMomentum(Vector3 pos, Vector3? v) 997 public void TeleportWithMomentum(Vector3 pos, Vector3? v)
998 { 998 {
999 if (ParentID != (uint)0)
1000 StandUp();
999 bool isFlying = Flying; 1001 bool isFlying = Flying;
1000 Vector3 vel = Velocity; 1002 Vector3 vel = Velocity;
1001 RemoveFromPhysicalScene(); 1003 RemoveFromPhysicalScene();