diff options
Diffstat (limited to 'OpenSim/Services/GridService/HypergridLinker.cs')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 11 |
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 | |||
327 | else | 327 | else |
328 | regInfo.RegionName = externalName; | 328 | regInfo.RegionName = externalName; |
329 | 329 | ||
330 | m_log.Debug("[HYPERGRID LINKER]: naming linked region " + regInfo.RegionName); | 330 | m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString()); |
331 | 331 | ||
332 | // Get the map image | 332 | // Get the map image |
333 | regInfo.TerrainImage = m_GatekeeperConnector.GetMapImage(regionID, imageURL, m_MapTileDirectory); | 333 | regInfo.TerrainImage = GetMapImage(regionID, imageURL); |
334 | |||
335 | // Store the origin's coordinates somewhere | ||
336 | regInfo.RegionSecret = handle.ToString(); | ||
334 | 337 | ||
335 | AddHyperlinkRegion(regInfo, handle); | 338 | AddHyperlinkRegion(regInfo, handle); |
336 | m_log.Info("[HYPERGRID LINKER]: Successfully linked to region_uuid " + regInfo.RegionID); | 339 | m_log.Info("[HYPERGRID LINKER]: Successfully linked to region_uuid " + regInfo.RegionID); |
@@ -427,6 +430,10 @@ namespace OpenSim.Services.GridService | |||
427 | m_Database.Delete(regionID); | 430 | m_Database.Delete(regionID); |
428 | } | 431 | } |
429 | 432 | ||
433 | public UUID GetMapImage(UUID regionID, string imageURL) | ||
434 | { | ||
435 | return m_GatekeeperConnector.GetMapImage(regionID, imageURL, m_MapTileDirectory); | ||
436 | } | ||
430 | #endregion | 437 | #endregion |
431 | 438 | ||
432 | 439 | ||