OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

0.7.1-dev
Justin Clark-Casey (justincc) 2011-02-04 21:15:41 +00:00
parent 034327b51f 144f367863
commit 2ddec29c61
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Services/GridService/HypergridLinker.cs
View File

@ -220,9 +220,15 @@ namespace OpenSim.Services.GridService
string[] parts = mapName.Split(new char[] {' '}); string[] parts = mapName.Split(new char[] {' '});
string regionName = String.Empty; string regionName = String.Empty;
if (parts.Length > 1) if (parts.Length > 1)
regionName = parts[1]; {
regionName = mapName.Substring(parts[0].Length + 1);
regionName = regionName.Trim(new char[] {'"'});
}
if (TryCreateLink(scopeID, xloc, yloc, regionName, 0, null, parts[0], ownerID, out regInfo, out reason)) if (TryCreateLink(scopeID, xloc, yloc, regionName, 0, null, parts[0], ownerID, out regInfo, out reason))
{
regInfo.RegionName = mapName;
return regInfo; return regInfo;
}
} }
return null; return null;
@ -311,15 +317,15 @@ namespace OpenSim.Services.GridService
{ {
RemoveHyperlinkRegion(regInfo.RegionID); RemoveHyperlinkRegion(regInfo.RegionID);
reason = "Region is too far (" + x + ", " + y + ")"; reason = "Region is too far (" + x + ", " + y + ")";
m_log.Info("[HYPERGRID LINKER]: Unable to link, region is too far (" + x + ", " + y + ")"); m_log.Info("[HYPERGRID LINKER]: Unable to link, reqgion is too far (" + x + ", " + y + ")");
return false; return false;
} }
regInfo.RegionID = regionID; regInfo.RegionID = regionID;
if ( externalName == string.Empty ) if (externalName == string.Empty)
regInfo.RegionName = regInfo.ServerURI; regInfo.RegionName = regInfo.ServerURI;
else else
regInfo.RegionName = externalName; regInfo.RegionName = externalName;
m_log.Debug("[HYPERGRID LINKER]: naming linked region " + regInfo.RegionName); m_log.Debug("[HYPERGRID LINKER]: naming linked region " + regInfo.RegionName);