diff options
| author | Melanie | 2012-04-25 02:33:39 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-25 02:33:39 +0100 |
| commit | 9a235018247cb8dfe07043c354b31da155d19e1f (patch) | |
| tree | db8c223bc505a0bf9437d3550f4a101d24874545 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum() (diff) | |
| download | opensim-SC_OLD-9a235018247cb8dfe07043c354b31da155d19e1f.zip opensim-SC_OLD-9a235018247cb8dfe07043c354b31da155d19e1f.tar.gz opensim-SC_OLD-9a235018247cb8dfe07043c354b31da155d19e1f.tar.bz2 opensim-SC_OLD-9a235018247cb8dfe07043c354b31da155d19e1f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index f3f03f5..9e60c88 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1065,14 +1065,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1065 | /// <param name="pos"></param> | 1065 | /// <param name="pos"></param> |
| 1066 | public void Teleport(Vector3 pos) | 1066 | public void Teleport(Vector3 pos) |
| 1067 | { | 1067 | { |
| 1068 | bool isFlying = Flying; | 1068 | TeleportWithMomentum(pos, Vector3.Zero); |
| 1069 | RemoveFromPhysicalScene(); | ||
| 1070 | Velocity = Vector3.Zero; | ||
| 1071 | CheckLandingPoint(ref pos); | ||
| 1072 | AbsolutePosition = pos; | ||
| 1073 | AddToPhysicalScene(isFlying); | ||
| 1074 | |||
| 1075 | SendTerseUpdateToAllClients(); | ||
| 1076 | } | 1069 | } |
| 1077 | 1070 | ||
| 1078 | public void TeleportWithMomentum(Vector3 pos) | 1071 | public void TeleportWithMomentum(Vector3 pos) |