Merge branch 'master' into httptests

1 files changed, 15 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ba3aaae..f9c7031 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1620,7 +1620,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void TeleportWithMomentum(Vector3 pos, Vector3? v)
         {
             if(!CheckLocalTPLandingPoint(ref pos))
-                return;
+                    return;
 
             if (ParentID != (uint)0)
                 StandUp();
@@ -1642,6 +1642,20 @@ namespace OpenSim.Region.Framework.Scenes
             SendTerseUpdateToAllClients();
         }
 
+        public void TeleportOnEject(Vector3 pos)
+        {
+            if (ParentID != (uint)0)
+                StandUp();
+
+            bool isFlying = Flying;
+            RemoveFromPhysicalScene();
+
+            AbsolutePosition = pos;
+
+            AddToPhysicalScene(isFlying);
+            SendTerseUpdateToAllClients();
+        }
+
         public void avnLocalTeleport(Vector3 newpos, Vector3? newvel, bool rotateToVelXY)
         {
             if(!CheckLocalTPLandingPoint(ref newpos))