diff options
| author | Melanie | 2009-09-28 23:03:47 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-28 23:03:47 +0100 |
| commit | 07091493134341a316624d9a1f6a2ef1cfa2f2d8 (patch) | |
| tree | 1d394e128be9766656a441058b2bdf141ba90269 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Allow the notation config_name@port/dll_name:class_name as a handler spec (diff) | |
| parent | Forgot a return statement. (diff) | |
| download | opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.zip opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.gz opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.bz2 opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.xz | |
Merge branch 'grid-service-redux'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 6772f75..286b7ca 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -36,6 +36,7 @@ using OpenSim.Framework.Communications.Cache; | |||
| 36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
| 37 | using OpenSim.Region.Framework.Scenes.Types; | 37 | using OpenSim.Region.Framework.Scenes.Types; |
| 38 | using OpenSim.Region.Physics.Manager; | 38 | using OpenSim.Region.Physics.Manager; |
| 39 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
| 39 | 40 | ||
| 40 | namespace OpenSim.Region.Framework.Scenes | 41 | namespace OpenSim.Region.Framework.Scenes |
| 41 | { | 42 | { |
| @@ -2934,8 +2935,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2934 | else if (dir > 3 && dir < 7) // Heading Sout | 2935 | else if (dir > 3 && dir < 7) // Heading Sout |
| 2935 | neighboury--; | 2936 | neighboury--; |
| 2936 | 2937 | ||
| 2937 | ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize)); | 2938 | int x = (int)(neighbourx * Constants.RegionSize); |
| 2938 | SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle); | 2939 | int y = (int)(neighboury * Constants.RegionSize); |
| 2940 | GridRegion neighbourRegion = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, x, y); | ||
| 2939 | 2941 | ||
| 2940 | if (neighbourRegion == null) | 2942 | if (neighbourRegion == null) |
| 2941 | { | 2943 | { |