diff options
Diffstat (limited to 'OpenSim/Services/GridService')
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 125c2be..aeff9b5 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -286,7 +286,7 @@ namespace OpenSim.Services.GridService | |||
286 | } | 286 | } |
287 | 287 | ||
288 | } | 288 | } |
289 | m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighours", region.RegionName, rinfos.Count); | 289 | m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count); |
290 | return rinfos; | 290 | return rinfos; |
291 | } | 291 | } |
292 | 292 | ||
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 588c1dd..9d98c8f 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -220,9 +220,15 @@ namespace OpenSim.Services.GridService | |||
220 | string[] parts = mapName.Split(new char[] {' '}); | 220 | string[] parts = mapName.Split(new char[] {' '}); |
221 | string regionName = String.Empty; | 221 | string regionName = String.Empty; |
222 | if (parts.Length > 1) | 222 | if (parts.Length > 1) |
223 | regionName = parts[1]; | 223 | { |
224 | regionName = mapName.Substring(parts[0].Length + 1); | ||
225 | regionName = regionName.Trim(new char[] {'"'}); | ||
226 | } | ||
224 | if (TryCreateLink(scopeID, xloc, yloc, regionName, 0, null, parts[0], ownerID, out regInfo, out reason)) | 227 | if (TryCreateLink(scopeID, xloc, yloc, regionName, 0, null, parts[0], ownerID, out regInfo, out reason)) |
228 | { | ||
229 | regInfo.RegionName = mapName; | ||
225 | return regInfo; | 230 | return regInfo; |
231 | } | ||
226 | } | 232 | } |
227 | 233 | ||
228 | return null; | 234 | return null; |
@@ -317,9 +323,9 @@ namespace OpenSim.Services.GridService | |||
317 | 323 | ||
318 | regInfo.RegionID = regionID; | 324 | regInfo.RegionID = regionID; |
319 | 325 | ||
320 | if ( externalName == string.Empty ) | 326 | if (externalName == string.Empty) |
321 | regInfo.RegionName = regInfo.ServerURI; | 327 | regInfo.RegionName = regInfo.ServerURI; |
322 | else | 328 | else |
323 | regInfo.RegionName = externalName; | 329 | regInfo.RegionName = externalName; |
324 | 330 | ||
325 | m_log.Debug("[HYPERGRID LINKER]: naming linked region " + regInfo.RegionName); | 331 | m_log.Debug("[HYPERGRID LINKER]: naming linked region " + regInfo.RegionName); |