diff options
| author | Melanie | 2010-12-31 15:45:08 +0100 |
|---|---|---|
| committer | Melanie | 2011-01-03 19:40:55 +0000 |
| commit | 9971766256e422aeb320827a51f041f3b732575b (patch) | |
| tree | 8c67cf611ec4e6844610567d89cb16b18c90d04b /OpenSim/Services/Connectors/Neighbour | |
| parent | Fix up a prior fix (refix the fixed fix :) (diff) | |
| download | opensim-SC_OLD-9971766256e422aeb320827a51f041f3b732575b.zip opensim-SC_OLD-9971766256e422aeb320827a51f041f3b732575b.tar.gz opensim-SC_OLD-9971766256e422aeb320827a51f041f3b732575b.tar.bz2 opensim-SC_OLD-9971766256e422aeb320827a51f041f3b732575b.tar.xz | |
Implement Scope ID lookup on GetLandData. Stacked regions were not handled
properly
Diffstat (limited to 'OpenSim/Services/Connectors/Neighbour')
| -rw-r--r-- | OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs index 93da10e..9e444c4 100644 --- a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs +++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs | |||
| @@ -71,7 +71,7 @@ namespace OpenSim.Services.Connectors | |||
| 71 | { | 71 | { |
| 72 | uint x = 0, y = 0; | 72 | uint x = 0, y = 0; |
| 73 | Utils.LongToUInts(regionHandle, out x, out y); | 73 | Utils.LongToUInts(regionHandle, out x, out y); |
| 74 | GridRegion regInfo = m_GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); | 74 | GridRegion regInfo = m_GridService.GetRegionByPosition(thisRegion.ScopeID, (int)x, (int)y); |
| 75 | if ((regInfo != null) && | 75 | if ((regInfo != null) && |
| 76 | // Don't remote-call this instance; that's a startup hickup | 76 | // Don't remote-call this instance; that's a startup hickup |
| 77 | !((regInfo.ExternalHostName == thisRegion.ExternalHostName) && (regInfo.HttpPort == thisRegion.HttpPort))) | 77 | !((regInfo.ExternalHostName == thisRegion.ExternalHostName) && (regInfo.HttpPort == thisRegion.HttpPort))) |