diff options
author | Diva Canto | 2009-09-27 10:14:10 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-27 10:14:10 -0700 |
commit | 5d09c53a1a42b38e1ee35cfbb5571d70b75380f4 (patch) | |
tree | 247412b0147ea11f4113413c1fa7d7e91eec0aa5 /OpenSim/Services/Connectors/Neighbour | |
parent | Poof! on LocalBackend. CommsManager.GridServices deleted. (diff) | |
download | opensim-SC_OLD-5d09c53a1a42b38e1ee35cfbb5571d70b75380f4.zip opensim-SC_OLD-5d09c53a1a42b38e1ee35cfbb5571d70b75380f4.tar.gz opensim-SC_OLD-5d09c53a1a42b38e1ee35cfbb5571d70b75380f4.tar.bz2 opensim-SC_OLD-5d09c53a1a42b38e1ee35cfbb5571d70b75380f4.tar.xz |
Unpacking the mess with OtherRegionUp, so we can have a real cache of the neighbours in the grid service modules.
Diffstat (limited to 'OpenSim/Services/Connectors/Neighbour')
-rw-r--r-- | OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs index 1b595e7..145f212 100644 --- a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs +++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs | |||
@@ -67,7 +67,7 @@ namespace OpenSim.Services.Connectors | |||
67 | m_GridService = gridServices; | 67 | m_GridService = gridServices; |
68 | } | 68 | } |
69 | 69 | ||
70 | public virtual bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) | 70 | public virtual GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) |
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); |
@@ -76,11 +76,11 @@ namespace OpenSim.Services.Connectors | |||
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))) |
78 | { | 78 | { |
79 | return DoHelloNeighbourCall(regInfo, thisRegion); | 79 | DoHelloNeighbourCall(regInfo, thisRegion); |
80 | } | 80 | } |
81 | //else | 81 | //else |
82 | // m_log.Warn("[REST COMMS]: Region not found " + regionHandle); | 82 | // m_log.Warn("[REST COMMS]: Region not found " + regionHandle); |
83 | return false; | 83 | return regInfo; |
84 | } | 84 | } |
85 | 85 | ||
86 | public bool DoHelloNeighbourCall(GridRegion region, RegionInfo thisRegion) | 86 | public bool DoHelloNeighbourCall(GridRegion region, RegionInfo thisRegion) |