OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

0.7.4.1
Dan Lake 2012-05-08 16:06:02 -07:00
parent 20952c75c5 c21c9e13ef
commit 3bc5620d74
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1003,6 +1003,8 @@ namespace OpenSim.Region.Framework.Scenes
public void TeleportWithMomentum(Vector3 pos, Vector3? v) public void TeleportWithMomentum(Vector3 pos, Vector3? v)
{ {
if (ParentID != (uint)0)
StandUp();
bool isFlying = Flying; bool isFlying = Flying;
Vector3 vel = Velocity; Vector3 vel = Velocity;
RemoveFromPhysicalScene(); RemoveFromPhysicalScene();