* Got rid of concrete GridDBService references
parent
82efceb494
commit
5b5b784599
|
@ -54,6 +54,11 @@ namespace OpenSim.Data
|
||||||
/// <param name="regionName">A partial regionName of the region to return</param>
|
/// <param name="regionName">A partial regionName of the region to return</param>
|
||||||
/// <returns>A SimProfileData for the region</returns>
|
/// <returns>A SimProfileData for the region</returns>
|
||||||
RegionProfileData GetRegion(string regionName);
|
RegionProfileData GetRegion(string regionName);
|
||||||
|
|
||||||
|
List<RegionProfileData> GetRegions(uint xmin, uint ymin, uint xmax, uint ymax);
|
||||||
|
List<RegionProfileData> GetRegions(string name, int maxNum);
|
||||||
|
DataResponse AddUpdateRegion(RegionProfileData sim, RegionProfileData existingSim);
|
||||||
|
DataResponse DeleteRegion(string uuid);
|
||||||
}
|
}
|
||||||
|
|
||||||
public interface IRegionProfileRouter
|
public interface IRegionProfileRouter
|
||||||
|
|
|
@ -32,6 +32,7 @@ using System.Reflection;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using Nwc.XmlRpc;
|
using Nwc.XmlRpc;
|
||||||
using log4net;
|
using log4net;
|
||||||
|
using OpenSim.Data;
|
||||||
using OpenSim.Framework.Servers;
|
using OpenSim.Framework.Servers;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Grid.Framework;
|
using OpenSim.Grid.Framework;
|
||||||
|
@ -42,7 +43,7 @@ namespace OpenSim.Grid.GridServer.Modules
|
||||||
{
|
{
|
||||||
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
protected GridDBService m_gridDBService;
|
protected IRegionProfileService m_gridDBService;
|
||||||
protected IGridServiceCore m_gridCore;
|
protected IGridServiceCore m_gridCore;
|
||||||
|
|
||||||
protected GridConfig m_config;
|
protected GridConfig m_config;
|
||||||
|
@ -61,7 +62,7 @@ namespace OpenSim.Grid.GridServer.Modules
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config)
|
public void Initialise(string opensimVersion, IRegionProfileService gridDBService, IGridServiceCore gridCore, GridConfig config)
|
||||||
{
|
{
|
||||||
//m_opensimVersion = opensimVersion;
|
//m_opensimVersion = opensimVersion;
|
||||||
m_gridDBService = gridDBService;
|
m_gridDBService = gridDBService;
|
||||||
|
|
|
@ -46,7 +46,7 @@ namespace OpenSim.Grid.GridServer.Modules
|
||||||
{
|
{
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
private GridDBService m_gridDBService;
|
private IRegionProfileService m_gridDBService;
|
||||||
private IGridServiceCore m_gridCore;
|
private IGridServiceCore m_gridCore;
|
||||||
|
|
||||||
protected GridConfig m_config;
|
protected GridConfig m_config;
|
||||||
|
@ -69,7 +69,7 @@ namespace OpenSim.Grid.GridServer.Modules
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config)
|
public void Initialise(string opensimVersion, IRegionProfileService gridDBService, IGridServiceCore gridCore, GridConfig config)
|
||||||
{
|
{
|
||||||
m_opensimVersion = opensimVersion;
|
m_opensimVersion = opensimVersion;
|
||||||
m_gridDBService = gridDBService;
|
m_gridDBService = gridDBService;
|
||||||
|
|
Loading…
Reference in New Issue