diff options
| author | Dan Lake | 2012-05-08 16:06:02 -0700 |
|---|---|---|
| committer | Dan Lake | 2012-05-08 16:06:02 -0700 |
| commit | 3bc5620d740cda0a242b76dcb0aa6f6ea017f953 (patch) | |
| tree | 428443c73b2a409dde415889e8d43c0d2ed88c11 /OpenSim | |
| parent | Trigger event when scene presences are updated (diff) | |
| parent | Mantis 1456 same region teleport of a sitting avatar. (diff) | |
| download | opensim-SC-3bc5620d740cda0a242b76dcb0aa6f6ea017f953.zip opensim-SC-3bc5620d740cda0a242b76dcb0aa6f6ea017f953.tar.gz opensim-SC-3bc5620d740cda0a242b76dcb0aa6f6ea017f953.tar.bz2 opensim-SC-3bc5620d740cda0a242b76dcb0aa6f6ea017f953.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index c552447..b737f91 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1003,6 +1003,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1003 | 1003 | ||
| 1004 | public void TeleportWithMomentum(Vector3 pos, Vector3? v) | 1004 | public void TeleportWithMomentum(Vector3 pos, Vector3? v) |
| 1005 | { | 1005 | { |
| 1006 | if (ParentID != (uint)0) | ||
| 1007 | StandUp(); | ||
| 1006 | bool isFlying = Flying; | 1008 | bool isFlying = Flying; |
| 1007 | Vector3 vel = Velocity; | 1009 | Vector3 vel = Velocity; |
| 1008 | RemoveFromPhysicalScene(); | 1010 | RemoveFromPhysicalScene(); |