aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs11
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index c539047..5262598 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -363,10 +363,13 @@ namespace OpenSim.Services.GridService
363 else 363 else
364 regInfo.RegionName = externalName; 364 regInfo.RegionName = externalName;
365 365
366 m_log.Debug("[HYPERGRID LINKER]: naming linked region " + regInfo.RegionName); 366 m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString());
367 367
368 // Get the map image 368 // Get the map image
369 regInfo.TerrainImage = m_GatekeeperConnector.GetMapImage(regionID, imageURL, m_MapTileDirectory); 369 regInfo.TerrainImage = GetMapImage(regionID, imageURL);
370
371 // Store the origin's coordinates somewhere
372 regInfo.RegionSecret = handle.ToString();
370 373
371 AddHyperlinkRegion(regInfo, handle); 374 AddHyperlinkRegion(regInfo, handle);
372 m_log.InfoFormat("[HYPERGRID LINKER]: Successfully linked to region {0} with image {1}", regInfo.RegionName, regInfo.TerrainImage); 375 m_log.InfoFormat("[HYPERGRID LINKER]: Successfully linked to region {0} with image {1}", regInfo.RegionName, regInfo.TerrainImage);
@@ -463,6 +466,10 @@ namespace OpenSim.Services.GridService
463 m_Database.Delete(regionID); 466 m_Database.Delete(regionID);
464 } 467 }
465 468
469 public UUID GetMapImage(UUID regionID, string imageURL)
470 {
471 return m_GatekeeperConnector.GetMapImage(regionID, imageURL, m_MapTileDirectory);
472 }
466 #endregion 473 #endregion
467 474
468 475