Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current

Conflicts:
	bin/Regions/Regions.ini.example

1 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 743d089..8335724 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -128,7 +128,10 @@ namespace OpenSim.Services.GridService
 
             m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");
 
-            m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", string.Empty);
+            m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
+                new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty);
+            // Legacy. Remove soon!
+            m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper);
             try
             {
                 m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper);
@@ -387,7 +390,7 @@ namespace OpenSim.Services.GridService
             m_log.DebugFormat("[HYPERGRID LINKER]: Request to unlink {0}", mapName);
             GridRegion regInfo = null;
 
-            List<RegionData> regions = m_Database.Get(mapName, m_ScopeID);
+            List<RegionData> regions = m_Database.Get(Util.EscapeForLike(mapName), m_ScopeID);
             if (regions != null && regions.Count > 0)
             {
                 OpenSim.Framework.RegionFlags rflags = (OpenSim.Framework.RegionFlags)Convert.ToInt32(regions[0].Data["flags"]);