diff options
| author | Melanie | 2012-04-25 16:49:07 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-25 16:49:07 +0100 |
| commit | 916e37238239cb579551641f86114ddd9b701c8e (patch) | |
| tree | 5286e964609b507dc15336c8a208be8f4201e707 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Slight rewording of output messages. (diff) | |
| download | opensim-SC_OLD-916e37238239cb579551641f86114ddd9b701c8e.zip opensim-SC_OLD-916e37238239cb579551641f86114ddd9b701c8e.tar.gz opensim-SC_OLD-916e37238239cb579551641f86114ddd9b701c8e.tar.bz2 opensim-SC_OLD-916e37238239cb579551641f86114ddd9b701c8e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9e60c88..ebfc1bd 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1068,11 +1068,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1068 | TeleportWithMomentum(pos, Vector3.Zero); | 1068 | TeleportWithMomentum(pos, Vector3.Zero); |
| 1069 | } | 1069 | } |
| 1070 | 1070 | ||
| 1071 | public void TeleportWithMomentum(Vector3 pos) | ||
| 1072 | { | ||
| 1073 | TeleportWithMomentum(pos, null); | ||
| 1074 | } | ||
| 1075 | |||
| 1076 | public void TeleportWithMomentum(Vector3 pos, Vector3? v) | 1071 | public void TeleportWithMomentum(Vector3 pos, Vector3? v) |
| 1077 | { | 1072 | { |
| 1078 | bool isFlying = Flying; | 1073 | bool isFlying = Flying; |