ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

ok.. another try on the HG uri

Browse Source
This commit is contained in:
UbitUmarov
2016-12-16 03:38:20 +00:00
parent 853e98d340
commit e2d46c060c
4 changed files with 160 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,11 +227,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
return rinfo;
}
public GridRegion GetRegionByName(UUID scopeID, string regionName)
public GridRegion GetRegionByName(UUID scopeID, string name)
{
GridRegion rinfo = m_LocalGridService.GetRegionByName(scopeID, regionName);
GridRegion rinfo = m_LocalGridService.GetRegionByName(scopeID, name);
if (rinfo != null)
return rinfo;
// HG urls should not get here, strip them
string regionName = name;
if(name.Contains("."))
{
string regionURI = "";
if(!Util.buildHGRegionURI(name, out regionURI, out regionName))
return rinfo;
}
rinfo = m_RemoteGridService.GetRegionByName(scopeID, regionName);
m_RegionInfoCache.Cache(scopeID, rinfo);
@@ -242,7 +251,19 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
{
List<GridRegion> rinfo = m_LocalGridService.GetRegionsByName(scopeID, name, maxNumber);
//m_log.DebugFormat("[REMOTE GRID CONNECTOR]: Local GetRegionsByName {0} found {1} regions", name, rinfo.Count);
List<GridRegion> grinfo = m_RemoteGridService.GetRegionsByName(scopeID, name, maxNumber);
// HG urls should not get here, strip them
// side effect is that local regions with same name as HG may also be found
// this mb good or bad
string regionName = name;
if(name.Contains("."))
{
string regionURI = "";
if(!Util.buildHGRegionURI(name, out regionURI, out regionName))
return rinfo;
}
List<GridRegion> grinfo = m_RemoteGridService.GetRegionsByName(scopeID, regionName, maxNumber);
if (grinfo != null)
{