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

2 files changed, 7 insertions, 5 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
index 046bee5..40ac647 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
@@ -322,10 +322,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             List<GridRegion> rinfos = new List<GridRegion>();
 
-            // Commenting until regionname exists
-            //foreach (SimpleRegionInfo r in m_HyperlinkRegions.Values)
-            //    if ((r.RegionName != null) && r.RegionName.StartsWith(name))
-            //        rinfos.Add(r);
+            if (name == string.Empty)
+                return rinfos;
+            
+            foreach (GridRegion r in m_HyperlinkRegions.Values)
+                if ((r.RegionName != null) && r.RegionName.ToLower().StartsWith(name.ToLower()))
+                    rinfos.Add(r);
 
             rinfos.AddRange(m_GridServiceConnector.GetRegionsByName(scopeID, name, maxNumber));
             return rinfos;
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 927eb7a..43e6c85 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -148,7 +148,7 @@
     MaximumTimeBeforePersistenceConsidered = 600
 
     ; Should avatars in neighbor sims see objects in this sim?
-    see_into_this_sim_from_neighbor = True
+    see_into_this_sim_from_neighbor = true
 
     ; ##
     ; ## PHYSICS