diff options
| author | Melanie | 2012-01-08 23:36:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-08 23:38:43 +0000 |
| commit | d5c5bbe0a171aa35d4a0612317b25c8b4b2a7f51 (patch) | |
| tree | b2ddc66143e05e6525ca3b03f077a61ed81c4803 /OpenSim | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-d5c5bbe0a171aa35d4a0612317b25c8b4b2a7f51.zip opensim-SC_OLD-d5c5bbe0a171aa35d4a0612317b25c8b4b2a7f51.tar.gz opensim-SC_OLD-d5c5bbe0a171aa35d4a0612317b25c8b4b2a7f51.tar.bz2 opensim-SC_OLD-d5c5bbe0a171aa35d4a0612317b25c8b4b2a7f51.tar.xz | |
Update teleport routing to match Avination
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1232d0c..e17d886 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1188,6 +1188,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1188 | client.Name, Scene.RegionInfo.RegionName, AbsolutePosition); | 1188 | client.Name, Scene.RegionInfo.RegionName, AbsolutePosition); |
| 1189 | 1189 | ||
| 1190 | Vector3 look = Velocity; | 1190 | Vector3 look = Velocity; |
| 1191 | |||
| 1191 | if ((look.X == 0) && (look.Y == 0) && (look.Z == 0)) | 1192 | if ((look.X == 0) && (look.Y == 0) && (look.Z == 0)) |
| 1192 | { | 1193 | { |
| 1193 | look = new Vector3(0.99f, 0.042f, 0); | 1194 | look = new Vector3(0.99f, 0.042f, 0); |
| @@ -3816,7 +3817,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3816 | m_reprioritization_called = false; | 3817 | m_reprioritization_called = false; |
| 3817 | } | 3818 | } |
| 3818 | } | 3819 | } |
| 3819 | 3820 | ||
| 3820 | private void CheckLandingPoint(ref Vector3 pos) | 3821 | private void CheckLandingPoint(ref Vector3 pos) |
| 3821 | { | 3822 | { |
| 3822 | // Never constrain lures | 3823 | // Never constrain lures |