From 5b5b7845991f284c55ffe8758382eb3f06f7d840 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 26 Feb 2009 11:50:49 +0000
Subject: * Got rid of concrete GridDBService references
---
OpenSim/Data/IRegionProfileService.cs | 5 +++++
OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs | 5 +++--
OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs | 4 ++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/OpenSim/Data/IRegionProfileService.cs b/OpenSim/Data/IRegionProfileService.cs
index 7a2b46f..b3acc52 100644
--- a/OpenSim/Data/IRegionProfileService.cs
+++ b/OpenSim/Data/IRegionProfileService.cs
@@ -54,6 +54,11 @@ namespace OpenSim.Data
/// A partial regionName of the region to return
/// A SimProfileData for the region
RegionProfileData GetRegion(string regionName);
+
+ List GetRegions(uint xmin, uint ymin, uint xmax, uint ymax);
+ List GetRegions(string name, int maxNum);
+ DataResponse AddUpdateRegion(RegionProfileData sim, RegionProfileData existingSim);
+ DataResponse DeleteRegion(string uuid);
}
public interface IRegionProfileRouter
diff --git a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs
index 8ae19a9..71e17dc 100644
--- a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs
@@ -32,6 +32,7 @@ using System.Reflection;
using System.Text;
using Nwc.XmlRpc;
using log4net;
+using OpenSim.Data;
using OpenSim.Framework.Servers;
using OpenSim.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);
- protected GridDBService m_gridDBService;
+ protected IRegionProfileService m_gridDBService;
protected IGridServiceCore m_gridCore;
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_gridDBService = gridDBService;
diff --git a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
index 2f51443..0650a1f 100644
--- a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Grid.GridServer.Modules
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private GridDBService m_gridDBService;
+ private IRegionProfileService m_gridDBService;
private IGridServiceCore m_gridCore;
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_gridDBService = gridDBService;
--
cgit v1.1