OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made GetMapImage public in the Hyperlinker

bulletsim
Diva Canto 2011-05-30 20:23:45 -07:00
parent b81a304baa
commit 44371118a2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Services/GridService/HypergridLinker.cs
View File

@ -61,10 +61,6 @@ namespace OpenSim.Services.GridService
protected GridService m_GridService; protected GridService m_GridService;
protected IAssetService m_AssetService; protected IAssetService m_AssetService;
protected GatekeeperServiceConnector m_GatekeeperConnector; protected GatekeeperServiceConnector m_GatekeeperConnector;
public GatekeeperServiceConnector GatekeeperConnector
{
get { return m_GatekeeperConnector; }
}
protected UUID m_ScopeID = UUID.Zero; protected UUID m_ScopeID = UUID.Zero;
protected bool m_Check4096 = true; 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()); m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString());
// Get the map image // Get the map image
regInfo.TerrainImage = m_GatekeeperConnector.GetMapImage(regionID, imageURL, m_MapTileDirectory); regInfo.TerrainImage = GetMapImage(regionID, imageURL);
// Store the origin's coordinates somewhere // Store the origin's coordinates somewhere
regInfo.RegionSecret = handle.ToString(); regInfo.RegionSecret = handle.ToString();
@ -470,6 +466,10 @@ namespace OpenSim.Services.GridService
m_Database.Delete(regionID); m_Database.Delete(regionID);
} }
public UUID GetMapImage(UUID regionID, string imageURL)
{
return m_GatekeeperConnector.GetMapImage(regionID, imageURL, m_MapTileDirectory);
}
#endregion #endregion