From e14b7ec9e115dd1705d6952f5ecbb19806709944 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 30 May 2011 17:19:46 -0700
Subject: HGWorldMap: don't send map blocks of hyperlinks that are farther than
 4096 cells from the current region.

---
 OpenSim/Services/GridService/HypergridLinker.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Services/GridService/HypergridLinker.cs')

diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index c539047..b7c0e91 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -363,11 +363,14 @@ namespace OpenSim.Services.GridService
              else
                 regInfo.RegionName = externalName;
 
-            m_log.Debug("[HYPERGRID LINKER]: naming linked region " + regInfo.RegionName);
+            m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString());
                 
             // Get the map image
             regInfo.TerrainImage = m_GatekeeperConnector.GetMapImage(regionID, imageURL, m_MapTileDirectory);
 
+            // Store the origin's coordinates somewhere
+            regInfo.RegionSecret = handle.ToString();
+
             AddHyperlinkRegion(regInfo, handle);
             m_log.InfoFormat("[HYPERGRID LINKER]: Successfully linked to region {0} with image {1}", regInfo.RegionName, regInfo.TerrainImage);
             return true;
-- 
cgit v1.1


From b81a304baaeeee4e0dabb42c8e217c3c30be9863 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 30 May 2011 20:12:05 -0700
Subject: Made the GatekeeperConnector a public property.

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

(limited to 'OpenSim/Services/GridService/HypergridLinker.cs')

diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index b7c0e91..64935af 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -61,6 +61,10 @@ namespace OpenSim.Services.GridService
         protected GridService m_GridService;
         protected IAssetService m_AssetService;
         protected GatekeeperServiceConnector m_GatekeeperConnector;
+        public GatekeeperServiceConnector GatekeeperConnector
+        {
+            get { return m_GatekeeperConnector; }
+        }
 
         protected UUID m_ScopeID = UUID.Zero;
         protected bool m_Check4096 = true;
-- 
cgit v1.1


From 44371118a2ac50b21e31995d3bcc309a5e1dc56c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 30 May 2011 20:23:45 -0700
Subject: Made GetMapImage public in the Hyperlinker

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

(limited to 'OpenSim/Services/GridService/HypergridLinker.cs')

diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 64935af..5262598 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -61,10 +61,6 @@ namespace OpenSim.Services.GridService
         protected GridService m_GridService;
         protected IAssetService m_AssetService;
         protected GatekeeperServiceConnector m_GatekeeperConnector;
-        public GatekeeperServiceConnector GatekeeperConnector
-        {
-            get { return m_GatekeeperConnector; }
-        }
 
         protected UUID m_ScopeID = UUID.Zero;
         protected bool m_Check4096 = true;
@@ -370,7 +366,7 @@ namespace OpenSim.Services.GridService
             m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString());
                 
             // Get the map image
-            regInfo.TerrainImage = m_GatekeeperConnector.GetMapImage(regionID, imageURL, m_MapTileDirectory);
+            regInfo.TerrainImage = GetMapImage(regionID, imageURL);
 
             // Store the origin's coordinates somewhere
             regInfo.RegionSecret = handle.ToString();
@@ -470,6 +466,10 @@ namespace OpenSim.Services.GridService
             m_Database.Delete(regionID);
         }
 
+        public UUID GetMapImage(UUID regionID, string imageURL)
+        {
+            return m_GatekeeperConnector.GetMapImage(regionID, imageURL, m_MapTileDirectory);
+        }
         #endregion
 
 
-- 
cgit v1.1