From 1613d89383574f7bba3102376e6f3a2ee99b1270 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Feb 2011 20:51:51 +0000
Subject: minor: Correct misspelling of neighbour in log messages.

Thanks Fly-Man-
---
 OpenSim/Services/GridService/GridService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Services/GridService')

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
                     }
 
             }
-            m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighours", region.RegionName, rinfos.Count);
+            m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count);
             return rinfos;
         }
 
-- 
cgit v1.1


From 144f3678631436a252ccd9a149f41e4f3711b50a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 4 Feb 2011 12:57:22 -0800
Subject: Bug fixed on map search for HG. Affected queries that had a region
 name at the end.

---
 OpenSim/Services/GridService/HypergridLinker.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Services/GridService')

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);
-- 
cgit v1.1


From 456cdee5ce0aa6508702d6d5051e17162bf772eb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Feb 2011 21:42:45 +0000
Subject: minor: correct a log spelling mistake that was pointed out to me

---
 OpenSim/Services/GridService/HypergridLinker.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Services/GridService')

diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 80f2caf..9d98c8f 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -317,7 +317,7 @@ namespace OpenSim.Services.GridService
             {
                 RemoveHyperlinkRegion(regInfo.RegionID);
                 reason = "Region is too far (" + x + ", " + y + ")";
-                m_log.Info("[HYPERGRID LINKER]: Unable to link, reqgion is too far (" + x + ", " + y + ")");
+                m_log.Info("[HYPERGRID LINKER]: Unable to link, region is too far (" + x + ", " + y + ")");
                 return false;
             }
 
-- 
cgit v1.1