ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 13:15:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unpacking the mess with OtherRegionUp, so we can have a real cache of the neighbours in the grid service modules.

Browse Source
This commit is contained in:
Diva Canto
2009-09-27 10:14:10 -07:00
parent 68e40a87ca
commit 5d09c53a1a
16 changed files with 99 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
View File

@@ -67,7 +67,7 @@ namespace OpenSim.Services.Connectors
m_GridService = gridServices;
}
public virtual bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
public virtual GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
{
uint x = 0, y = 0;
Utils.LongToUInts(regionHandle, out x, out y);
@@ -76,11 +76,11 @@ namespace OpenSim.Services.Connectors
// Don't remote-call this instance; that's a startup hickup
!((regInfo.ExternalHostName == thisRegion.ExternalHostName) && (regInfo.HttpPort == thisRegion.HttpPort)))
{
return DoHelloNeighbourCall(regInfo, thisRegion);
DoHelloNeighbourCall(regInfo, thisRegion);
}
//else
// m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
return false;
return regInfo;
}
public bool DoHelloNeighbourCall(GridRegion region, RegionInfo thisRegion)

3
OpenSim/Services/Interfaces/INeighbourService.cs
View File

@@ -28,11 +28,12 @@
using System;
using OpenSim.Framework;
using OpenMetaverse;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;
namespace OpenSim.Services.Interfaces
{
public interface INeighbourService
{
bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion);
GridRegion HelloNeighbour(ulong regionHandle, RegionInfo otherRegion);
}
}