diff options
author | Mic Bowman | 2011-01-03 17:05:24 -0800 |
---|---|---|
committer | Mic Bowman | 2011-01-03 17:05:24 -0800 |
commit | d3987024d776f08c4eabba4df8353971aa9466b8 (patch) | |
tree | eeb635c58f18a5592578682b36aa430da8286fd6 /OpenSim/Services/Connectors/Neighbour | |
parent | Standardize the way WebRequests are made in the SimulationServiceConnector. A... (diff) | |
parent | Add permissions hooks for object transfers (diff) | |
download | opensim-SC_OLD-d3987024d776f08c4eabba4df8353971aa9466b8.zip opensim-SC_OLD-d3987024d776f08c4eabba4df8353971aa9466b8.tar.gz opensim-SC_OLD-d3987024d776f08c4eabba4df8353971aa9466b8.tar.bz2 opensim-SC_OLD-d3987024d776f08c4eabba4df8353971aa9466b8.tar.xz |
Merge branch 'master' into cmickeyb
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))) |