diff options
| author | Melanie | 2009-09-21 18:12:12 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-21 18:12:12 +0100 |
| commit | 5511c62580c09cf98a1f2d717b478cc0f1881a6d (patch) | |
| tree | 95a5d36141ee39d25eba76105a4780a9536f0e8d /OpenSim/Region | |
| parent | Add a RequestID (UUID.Random()) to the PollRequest and pass it to all (diff) | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-5511c62580c09cf98a1f2d717b478cc0f1881a6d.zip opensim-SC_OLD-5511c62580c09cf98a1f2d717b478cc0f1881a6d.tar.gz opensim-SC_OLD-5511c62580c09cf98a1f2d717b478cc0f1881a6d.tar.bz2 opensim-SC_OLD-5511c62580c09cf98a1f2d717b478cc0f1881a6d.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 6475817..74ece2e 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | |||
| @@ -140,9 +140,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
| 140 | return m_GridService.DeregisterRegion(regionID); | 140 | return m_GridService.DeregisterRegion(regionID); |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | public List<SimpleRegionInfo> GetNeighbours(UUID scopeID, int x, int y) | 143 | public List<SimpleRegionInfo> GetNeighbours(UUID scopeID, UUID regionID) |
| 144 | { | 144 | { |
| 145 | return m_GridService.GetNeighbours(scopeID, x, y); | 145 | return m_GridService.GetNeighbours(scopeID, regionID); |
| 146 | } | 146 | } |
| 147 | 147 | ||
| 148 | public SimpleRegionInfo GetRegionByUUID(UUID scopeID, UUID regionID) | 148 | public SimpleRegionInfo GetRegionByUUID(UUID scopeID, UUID regionID) |