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

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
                 string[] parts = mapName.Split(new char[] {' '});
                 string regionName = String.Empty;
                 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))
+                {
+                    regInfo.RegionName = mapName; 
                     return regInfo;
+                }
             }
 
             return null;
@@ -311,15 +317,15 @@ namespace OpenSim.Services.GridService
             {
                 RemoveHyperlinkRegion(regInfo.RegionID);
                 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;
             }
 
             regInfo.RegionID = regionID;
 
-            if ( externalName == string.Empty )
+            if (externalName == string.Empty)
                 regInfo.RegionName = regInfo.ServerURI;
-            else
+             else
                 regInfo.RegionName = externalName;
 
             m_log.Debug("[HYPERGRID LINKER]: naming linked region " + regInfo.RegionName);