Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2012-05-08 16:06:02 -07:00 · 2012-05-08 16:06:02 -07:00 · 3bc5620d74
parent 20952c75c5 c21c9e13ef
commit 3bc5620d74
1 changed files with 2 additions and 0 deletions
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@ -1003,6 +1003,8 @@ namespace OpenSim.Region.Framework.Scenes

        public void TeleportWithMomentum(Vector3 pos, Vector3? v)
        {
+            if (ParentID != (uint)0)
+                StandUp();
            bool isFlying = Flying;
            Vector3 vel = Velocity;
            RemoveFromPhysicalScene();