diff options
author | Diva Canto | 2011-05-30 20:23:45 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-30 20:23:45 -0700 |
commit | 44371118a2ac50b21e31995d3bcc309a5e1dc56c (patch) | |
tree | 7bbbc46ec2dd40decc048989d5f20c015c7d19f0 | |
parent | Made the GatekeeperConnector a public property. (diff) | |
download | opensim-SC_OLD-44371118a2ac50b21e31995d3bcc309a5e1dc56c.zip opensim-SC_OLD-44371118a2ac50b21e31995d3bcc309a5e1dc56c.tar.gz opensim-SC_OLD-44371118a2ac50b21e31995d3bcc309a5e1dc56c.tar.bz2 opensim-SC_OLD-44371118a2ac50b21e31995d3bcc309a5e1dc56c.tar.xz |
Made GetMapImage public in the Hyperlinker
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 10 |
1 files changed, 5 insertions, 5 deletions
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 | |||
61 | protected GridService m_GridService; | 61 | protected GridService m_GridService; |
62 | protected IAssetService m_AssetService; | 62 | protected IAssetService m_AssetService; |
63 | protected GatekeeperServiceConnector m_GatekeeperConnector; | 63 | protected GatekeeperServiceConnector m_GatekeeperConnector; |
64 | public GatekeeperServiceConnector GatekeeperConnector | ||
65 | { | ||
66 | get { return m_GatekeeperConnector; } | ||
67 | } | ||
68 | 64 | ||
69 | protected UUID m_ScopeID = UUID.Zero; | 65 | protected UUID m_ScopeID = UUID.Zero; |
70 | protected bool m_Check4096 = true; | 66 | protected bool m_Check4096 = true; |
@@ -370,7 +366,7 @@ namespace OpenSim.Services.GridService | |||
370 | m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString()); | 366 | m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString()); |
371 | 367 | ||
372 | // Get the map image | 368 | // Get the map image |
373 | regInfo.TerrainImage = m_GatekeeperConnector.GetMapImage(regionID, imageURL, m_MapTileDirectory); | 369 | regInfo.TerrainImage = GetMapImage(regionID, imageURL); |
374 | 370 | ||
375 | // Store the origin's coordinates somewhere | 371 | // Store the origin's coordinates somewhere |
376 | regInfo.RegionSecret = handle.ToString(); | 372 | regInfo.RegionSecret = handle.ToString(); |
@@ -470,6 +466,10 @@ namespace OpenSim.Services.GridService | |||
470 | m_Database.Delete(regionID); | 466 | m_Database.Delete(regionID); |
471 | } | 467 | } |
472 | 468 | ||
469 | public UUID GetMapImage(UUID regionID, string imageURL) | ||
470 | { | ||
471 | return m_GatekeeperConnector.GetMapImage(regionID, imageURL, m_MapTileDirectory); | ||
472 | } | ||
473 | #endregion | 473 | #endregion |
474 | 474 | ||
475 | 475 | ||