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

1 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index b226971..6d63748 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -327,10 +327,13 @@ 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);
+            regInfo.TerrainImage = GetMapImage(regionID, imageURL);
+
+            // Store the origin's coordinates somewhere
+            regInfo.RegionSecret = handle.ToString();
 
             AddHyperlinkRegion(regInfo, handle);
             m_log.Info("[HYPERGRID LINKER]: Successfully linked to region_uuid " + regInfo.RegionID);
@@ -427,6 +430,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