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

add a little more debug for now

0.9.1.0-post-fixes
UbitUmarov 2019-09-03 02:10:07 +01:00
parent eedb0a1c85
commit fd252b1285
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
View File

@ -257,11 +257,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
return rinfo; // invalid return rinfo; // invalid
if (!m_ThisGatekeeperHost.Equals(regionHost, StringComparison.InvariantCultureIgnoreCase) && !m_ThisGatekeeperIP.Equals(regionHost)) if (!m_ThisGatekeeperHost.Equals(regionHost, StringComparison.InvariantCultureIgnoreCase) && !m_ThisGatekeeperIP.Equals(regionHost))
return rinfo; // not local grid return rinfo; // not local grid
if (String.IsNullOrEmpty(regionName))
return m_RemoteGridService.GetDefaultRegions(scopeID)[0];
} }
rinfo = m_RemoteGridService.GetRegionByName(scopeID, regionName); if (String.IsNullOrEmpty(regionName))
{
rinfo = m_RemoteGridService.GetDefaultRegions(UUID.Zero)[0];
if (rinfo == null)
m_log.Warn("[REMOTE GRID CONNECTOR] returned null default region");
else
m_log.WarnFormat("[REMOTE GRID CONNECTOR] returned default region {0}", rinfo.RegionName);
}
else
rinfo = m_RemoteGridService.GetRegionByName(scopeID, regionName);
m_RegionInfoCache.Cache(scopeID, rinfo); m_RegionInfoCache.Cache(scopeID, rinfo);
return rinfo; return rinfo;
} }
@ -290,7 +297,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
List<GridRegion> grinfo = null; List<GridRegion> grinfo = null;
if (String.IsNullOrEmpty(regionName)) if (String.IsNullOrEmpty(regionName))
grinfo = m_RemoteGridService.GetDefaultRegions(scopeID); {
List<GridRegion> grinfos = m_RemoteGridService.GetDefaultRegions(UUID.Zero);
if (grinfos == null)
m_log.Warn("[REMOTE GRID CONNECTOR] returned null default regions");
else
{
m_log.WarnFormat("[REMOTE GRID CONNECTOR] returned default regions {0}, ...", grinfos[0].RegionName);
// only return first
grinfo = new List<GridRegion>(){grinfos[0]};
}
}
else else
grinfo = m_RemoteGridService.GetRegionsByName(scopeID, regionName, maxNumber); grinfo = m_RemoteGridService.GetRegionsByName(scopeID, regionName, maxNumber);