From a896aac4bd602b8b3ea6fb9f0c33a29f70912499 Mon Sep 17 00:00:00 2001
From: Talun <None>
Date: Mon, 7 May 2012 21:44:17 +0100
Subject: [PATCH] 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.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 48b6170a7f..d4bbbe6253 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1058,6 +1058,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();