From 2d209d3844a58a4d27fe15aa5ccd497bbd530707 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 28 Mar 2011 16:46:04 -0700
Subject: Fix mantis #5413. WARNING: new config variable in section
 [GridService] of the simulators called Gatekeeper -- intended to have the URL
 of the grid's Gatekeeper service (so that it can be checked against). See
 ini.examples.

---
 OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs |  6 +++++-
 OpenSim/Services/GridService/HypergridLinker.cs              | 10 ++++++++++
 bin/config-include/GridCommon.ini.example                    |  6 ++++++
 bin/config-include/StandaloneCommon.ini.example              |  5 +++++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 7bb7544..f9ef286 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -100,8 +100,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 // service wasn't available; maybe still an old GridServer. Try the old API, though it will return only one region
                 regionInfos = new List<GridRegion>();
                 GridRegion info = m_scene.GridService.GetRegionByName(m_scene.RegionInfo.ScopeID, mapName);
-                if (info != null) regionInfos.Add(info);
+                if (info != null) 
+                    regionInfos.Add(info);
             }
+            else if (regionInfos.Count == 0 && mapName.StartsWith("http://"))
+                remoteClient.SendAlertMessage("Hyperlink could not be established.");
+
             m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count);
             List<MapBlockData> blocks = new List<MapBlockData>();
 
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 12ea453..585d088 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Services.GridService
         protected UUID m_ScopeID = UUID.Zero;
         protected bool m_Check4096 = true;
         protected string m_MapTileDirectory = string.Empty;
+        protected string m_ThisGatekeeper = string.Empty;
 
         // Hyperlink regions are hyperlinks on the map
         public readonly Dictionary<UUID, GridRegion> m_HyperlinkRegions = new Dictionary<UUID, GridRegion>();
@@ -123,6 +124,8 @@ namespace OpenSim.Services.GridService
 
                 m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");
 
+                m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", string.Empty);
+
                 m_GatekeeperConnector = new GatekeeperServiceConnector(m_AssetService);
 
                 m_log.Debug("[HYPERGRID LINKER]: Loaded all services...");
@@ -266,6 +269,13 @@ namespace OpenSim.Services.GridService
             regInfo.ScopeID = scopeID;
             regInfo.EstateOwner = ownerID;
 
+            // Make sure we're not hyperlinking to regions on this grid!
+            if (regInfo.ServerURI.Trim(new char[]{'/', ' '}) == m_ThisGatekeeper.Trim(new char[]{'/', ' '}))
+            {
+                reason = "Cannot hyperlink to regions on the same grid";
+                return false;
+            }
+
             // Check for free coordinates
             GridRegion region = m_GridService.GetRegionByPosition(regInfo.ScopeID, regInfo.RegionLocX, regInfo.RegionLocY);
             if (region != null)
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 4dc0e53..a6fe4b1 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -45,6 +45,12 @@
     ;; Directory for map tile images of linked regions
     ; MapTileDirectory = "./maptiles"
 
+    ; === HG ONLY ===
+	;; change this to the address of your Gatekeeper service
+	;; (usually bundled with the rest of the services in one 
+	;; Robust server in port 8002, but not always)
+	Gatekeeper="http://mygridserver.com:8002"
+
 [AvatarService]
     ;
     ; change this to your grid-wide grid server
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 816e9a6..995a33e 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -78,6 +78,11 @@
     ;; For example:
     Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
+    ; === HG ONLY ===
+	;; change this to the address of your simulator
+	Gatekeeper="http://127.0.0.1:9000"
+
+
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
     ;LibraryName = "My World's Library"
-- 
cgit v1.1