OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some method implementations were missing from LocalGridServiceConnector.

slimupdates
Diva Canto 2010-01-24 15:04:41 -08:00
parent 48b03c2c61
commit ea3d287f70
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
View File

@ -124,8 +124,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
protected override GridRegion GetFinalDestination(GridRegion region)
{
int flags = m_aScene.GridService.GetRegionFlags(m_aScene.RegionInfo.ScopeID, region.RegionID);
//m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: region {0} flags: {1}", region.RegionID, flags);
if ((flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0)
{
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region {0} is hyperlink", region.RegionID);
return m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID);
}
return region;

30
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
View File

@ -238,6 +238,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
return m_GridService.GetRegionRange(scopeID, xmin, xmax, ymin, ymax);
}
public List<GridRegion> GetDefaultRegions(UUID scopeID)
{
return m_GridService.GetDefaultRegions(scopeID);
}
public List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y)
{
return m_GridService.GetFallbackRegions(scopeID, x, y);
}
public int GetRegionFlags(UUID scopeID, UUID regionID)
{
return m_GridService.GetRegionFlags(scopeID, regionID);
}
#endregion
public void NeighboursCommand(string module, string[] cmdparams)
@ -251,20 +266,5 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
}
}
public List<GridRegion> GetDefaultRegions(UUID scopeID)
{
return null;
}
public List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y)
{
return null;
}
public int GetRegionFlags(UUID scopeID, UUID regionID)
{
return 0;
}
}
}

4
OpenSim/Services/GridService/GridService.cs
View File

@ -410,7 +410,9 @@ namespace OpenSim.Services.GridService
{
RegionData region = m_Database.Get(regionID, scopeID);
return Convert.ToInt32(region.Data["flags"]);
int flags = Convert.ToInt32(region.Data["flags"]);
//m_log.DebugFormat("[GRID SERVICE]: Request for flags of {0}: {1}", regionID, flags);
return flags;
}
private void HandleShowRegion(string module, string[] cmd)