aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-02-04 21:15:41 +0000
committerJustin Clark-Casey (justincc)2011-02-04 21:15:41 +0000
commit2ddec29c613bce5e0665acbbe0e1d7eb96c4e7a5 (patch)
tree849efbf734af9543d6ea70ceabc1f691c8e39933 /OpenSim/Services
parentSend object date to viewer in microseconds (Fixes mantis bug #3990) (diff)
parentBug fixed on map search for HG. Affected queries that had a region name at th... (diff)
downloadopensim-SC_OLD-2ddec29c613bce5e0665acbbe0e1d7eb96c4e7a5.zip
opensim-SC_OLD-2ddec29c613bce5e0665acbbe0e1d7eb96c4e7a5.tar.gz
opensim-SC_OLD-2ddec29c613bce5e0665acbbe0e1d7eb96c4e7a5.tar.bz2
opensim-SC_OLD-2ddec29c613bce5e0665acbbe0e1d7eb96c4e7a5.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs14
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 588c1dd..80f2caf 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;
@@ -311,15 +317,15 @@ namespace OpenSim.Services.GridService
311 { 317 {
312 RemoveHyperlinkRegion(regInfo.RegionID); 318 RemoveHyperlinkRegion(regInfo.RegionID);
313 reason = "Region is too far (" + x + ", " + y + ")"; 319 reason = "Region is too far (" + x + ", " + y + ")";
314 m_log.Info("[HYPERGRID LINKER]: Unable to link, region is too far (" + x + ", " + y + ")"); 320 m_log.Info("[HYPERGRID LINKER]: Unable to link, reqgion is too far (" + x + ", " + y + ")");
315 return false; 321 return false;
316 } 322 }
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);