diff options
| author | Melanie | 2010-06-07 00:44:36 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-07 00:44:36 +0100 |
| commit | 74d62901c89cd8d46c3ec912bf250b9af01eb2bb (patch) | |
| tree | 36e302ea764addda3ef8451b98222c5537b613a5 /OpenSim/Region/Framework/Scenes | |
| parent | Add a call to SOG.ResumeScripts() after region crossing / teleport (diff) | |
| parent | Add a call to SOG.ResumeScripts() after region crossing / teleport (diff) | |
| download | opensim-SC-74d62901c89cd8d46c3ec912bf250b9af01eb2bb.zip opensim-SC-74d62901c89cd8d46c3ec912bf250b9af01eb2bb.tar.gz opensim-SC-74d62901c89cd8d46c3ec912bf250b9af01eb2bb.tar.bz2 opensim-SC-74d62901c89cd8d46c3ec912bf250b9af01eb2bb.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 19329a8..756b81e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -4039,7 +4039,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4039 | // bordercross if position is outside of region | 4039 | // bordercross if position is outside of region |
| 4040 | 4040 | ||
| 4041 | if (!result) | 4041 | if (!result) |
| 4042 | { | ||
| 4042 | regionHandle = m_regInfo.RegionHandle; | 4043 | regionHandle = m_regInfo.RegionHandle; |
| 4044 | } | ||
| 4043 | else | 4045 | else |
| 4044 | { | 4046 | { |
| 4045 | // not in this region, undo the shift! | 4047 | // not in this region, undo the shift! |