diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index e237ca28a3..a1de57a9d3 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs @@ -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; diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 86a8c13e3c..1b00c8a9d7 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs @@ -238,6 +238,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid return m_GridService.GetRegionRange(scopeID, xmin, xmax, ymin, ymax); } + public List GetDefaultRegions(UUID scopeID) + { + return m_GridService.GetDefaultRegions(scopeID); + } + + public List 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 GetDefaultRegions(UUID scopeID) - { - return null; - } - - public List GetFallbackRegions(UUID scopeID, int x, int y) - { - return null; - } - - public int GetRegionFlags(UUID scopeID, UUID regionID) - { - return 0; - } - } } diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index ae29a741bd..b86fd4d7ea 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs @@ -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)