diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-30 02:49:50 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-30 02:49:50 -0400 |
| commit | 9f2f3afe22b28d8ff56f45148914eb8b9d933443 (patch) | |
| tree | 5e197e54b324ebbbd8f52c6583cab28940bc7d65 /OpenSim/Region | |
| parent | * whoops, forgot the other class initializer. (diff) | |
| download | opensim-SC_OLD-9f2f3afe22b28d8ff56f45148914eb8b9d933443.zip opensim-SC_OLD-9f2f3afe22b28d8ff56f45148914eb8b9d933443.tar.gz opensim-SC_OLD-9f2f3afe22b28d8ff56f45148914eb8b9d933443.tar.bz2 opensim-SC_OLD-9f2f3afe22b28d8ff56f45148914eb8b9d933443.tar.xz | |
* Fixes a teleport issue when teleporting out of a region to a different one.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 9255d36..b8c8f32 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3377,6 +3377,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3377 | 3377 | ||
| 3378 | if (!result) | 3378 | if (!result) |
| 3379 | regionHandle = m_regInfo.RegionHandle; | 3379 | regionHandle = m_regInfo.RegionHandle; |
| 3380 | else | ||
| 3381 | { | ||
| 3382 | // not in this region, undo the shift! | ||
| 3383 | position.X -= shiftx; | ||
| 3384 | position.Y -= shifty; | ||
| 3385 | } | ||
| 3380 | 3386 | ||
| 3381 | if (m_teleportModule != null) | 3387 | if (m_teleportModule != null) |
| 3382 | { | 3388 | { |