diff options
Diffstat (limited to 'OpenSim/Services')
4 files changed, 30 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs index ded7806..e863718 100644 --- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs +++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs | |||
@@ -330,6 +330,12 @@ namespace OpenSim.Services.Connectors | |||
330 | return rinfo; | 330 | return rinfo; |
331 | } | 331 | } |
332 | 332 | ||
333 | public GridRegion GetRegionByNameSpecific(UUID scopeID, string regionName) | ||
334 | { | ||
335 | |||
336 | return null; | ||
337 | } | ||
338 | |||
333 | public GridRegion GetRegionByName(UUID scopeID, string regionName) | 339 | public GridRegion GetRegionByName(UUID scopeID, string regionName) |
334 | { | 340 | { |
335 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 341 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index f8eebbe..04de4d7 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
@@ -100,6 +100,8 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
100 | 100 | ||
101 | #region IGridService | 101 | #region IGridService |
102 | 102 | ||
103 | |||
104 | |||
103 | public string RegisterRegion(UUID scopeID, GridRegion regionInfo) | 105 | public string RegisterRegion(UUID scopeID, GridRegion regionInfo) |
104 | { | 106 | { |
105 | IPEndPoint ext = regionInfo.ExternalEndPoint; | 107 | IPEndPoint ext = regionInfo.ExternalEndPoint; |
@@ -245,6 +247,12 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
245 | } | 247 | } |
246 | } | 248 | } |
247 | 249 | ||
250 | public GridRegion GetRegionByNameSpecific(UUID scopeID, string regionName) | ||
251 | { | ||
252 | |||
253 | return null; | ||
254 | } | ||
255 | |||
248 | public GridRegion GetRegionByName(UUID scopeID, string regionName) | 256 | public GridRegion GetRegionByName(UUID scopeID, string regionName) |
249 | { | 257 | { |
250 | List<GridRegion> regions = GetRegionsByName(scopeID, regionName, 1); | 258 | List<GridRegion> regions = GetRegionsByName(scopeID, regionName, 1); |
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 40893a9..b672e8c 100755 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -490,7 +490,18 @@ namespace OpenSim.Services.GridService | |||
490 | return null; | 490 | return null; |
491 | } | 491 | } |
492 | 492 | ||
493 | public List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber) | 493 | //BA MOD.... |
494 | public GridRegion GetRegionByNameSpecific(UUID scopeID, string name) | ||
495 | { | ||
496 | RegionData rdata = m_Database.GetSpecific(name, scopeID); | ||
497 | if (rdata != null) | ||
498 | { | ||
499 | return RegionData2RegionInfo(rdata); | ||
500 | } | ||
501 | return null; | ||
502 | } | ||
503 | |||
504 | public List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber) | ||
494 | { | 505 | { |
495 | // m_log.DebugFormat("[GRID SERVICE]: GetRegionsByName {0}", name); | 506 | // m_log.DebugFormat("[GRID SERVICE]: GetRegionsByName {0}", name); |
496 | 507 | ||
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index ead5d3c..f832d1d 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -84,6 +84,10 @@ namespace OpenSim.Services.Interfaces | |||
84 | /// <returns>Returns the region information if the name matched. Null otherwise.</returns> | 84 | /// <returns>Returns the region information if the name matched. Null otherwise.</returns> |
85 | GridRegion GetRegionByName(UUID scopeID, string regionName); | 85 | GridRegion GetRegionByName(UUID scopeID, string regionName); |
86 | 86 | ||
87 | |||
88 | //BA MOD..... | ||
89 | GridRegion GetRegionByNameSpecific(UUID scopeID, string regionName); | ||
90 | |||
87 | /// <summary> | 91 | /// <summary> |
88 | /// Get information about regions starting with the provided name. | 92 | /// Get information about regions starting with the provided name. |
89 | /// </summary> | 93 | /// </summary> |