ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix the issue where, when logging into the grid, the user supplies a region name, but instead of going to the specific region, they are sent to a region "Like" the one specified.

Browse Source 
Signed-off-by: Terry <terry@digiworldz.com>
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
This commit is contained in:
Terry
2019-11-12 11:02:10 -05:00
committed by UbitUmarov
parent eabf9a7c04
commit 2f79f463ea
10 changed files with 83 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
View File

@@ -330,6 +330,12 @@ namespace OpenSim.Services.Connectors
return rinfo;
}
public GridRegion GetRegionByNameSpecific(UUID scopeID, string regionName)
{
return null;
}
public GridRegion GetRegionByName(UUID scopeID, string regionName)
{
Dictionary<string, object> sendData = new Dictionary<string, object>();

8
OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
View File

@@ -100,6 +100,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
#region IGridService
public string RegisterRegion(UUID scopeID, GridRegion regionInfo)
{
IPEndPoint ext = regionInfo.ExternalEndPoint;
@@ -245,6 +247,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
}
}
public GridRegion GetRegionByNameSpecific(UUID scopeID, string regionName)
{
return null;
}
public GridRegion GetRegionByName(UUID scopeID, string regionName)
{
List<GridRegion> regions = GetRegionsByName(scopeID, regionName, 1);

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

@@ -490,7 +490,18 @@ namespace OpenSim.Services.GridService
return null;
}
public List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
//BA MOD....
public GridRegion GetRegionByNameSpecific(UUID scopeID, string name)
{
RegionData rdata = m_Database.GetSpecific(name, scopeID);
if (rdata != null)
{
return RegionData2RegionInfo(rdata);
}
return null;
}
public List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
{
// m_log.DebugFormat("[GRID SERVICE]: GetRegionsByName {0}", name);

4
OpenSim/Services/Interfaces/IGridService.cs
View File

@@ -84,6 +84,10 @@ namespace OpenSim.Services.Interfaces
/// <returns>Returns the region information if the name matched. Null otherwise.</returns>
GridRegion GetRegionByName(UUID scopeID, string regionName);
//BA MOD.....
GridRegion GetRegionByNameSpecific(UUID scopeID, string regionName);
/// <summary>
/// Get information about regions starting with the provided name.
/// </summary>