diff options
author | lbsa71 | 2009-02-26 11:50:49 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-26 11:50:49 +0000 |
commit | 5b5b7845991f284c55ffe8758382eb3f06f7d840 (patch) | |
tree | 08e0a34d160fa94d901e9722b4b4443ba727e08d | |
parent | * renamed IRegionProfileService to IRegionProfileRouter to better reflect use... (diff) | |
download | opensim-SC-5b5b7845991f284c55ffe8758382eb3f06f7d840.zip opensim-SC-5b5b7845991f284c55ffe8758382eb3f06f7d840.tar.gz opensim-SC-5b5b7845991f284c55ffe8758382eb3f06f7d840.tar.bz2 opensim-SC-5b5b7845991f284c55ffe8758382eb3f06f7d840.tar.xz |
* Got rid of concrete GridDBService references
-rw-r--r-- | OpenSim/Data/IRegionProfileService.cs | 5 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs | 5 | ||||
-rw-r--r-- | 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 | |||
54 | /// <param name="regionName">A partial regionName of the region to return</param> | 54 | /// <param name="regionName">A partial regionName of the region to return</param> |
55 | /// <returns>A SimProfileData for the region</returns> | 55 | /// <returns>A SimProfileData for the region</returns> |
56 | RegionProfileData GetRegion(string regionName); | 56 | RegionProfileData GetRegion(string regionName); |
57 | |||
58 | List<RegionProfileData> GetRegions(uint xmin, uint ymin, uint xmax, uint ymax); | ||
59 | List<RegionProfileData> GetRegions(string name, int maxNum); | ||
60 | DataResponse AddUpdateRegion(RegionProfileData sim, RegionProfileData existingSim); | ||
61 | DataResponse DeleteRegion(string uuid); | ||
57 | } | 62 | } |
58 | 63 | ||
59 | public interface IRegionProfileRouter | 64 | 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; | |||
32 | using System.Text; | 32 | using System.Text; |
33 | using Nwc.XmlRpc; | 33 | using Nwc.XmlRpc; |
34 | using log4net; | 34 | using log4net; |
35 | using OpenSim.Data; | ||
35 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
36 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
37 | using OpenSim.Grid.Framework; | 38 | using OpenSim.Grid.Framework; |
@@ -42,7 +43,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
42 | { | 43 | { |
43 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 45 | ||
45 | protected GridDBService m_gridDBService; | 46 | protected IRegionProfileService m_gridDBService; |
46 | protected IGridServiceCore m_gridCore; | 47 | protected IGridServiceCore m_gridCore; |
47 | 48 | ||
48 | protected GridConfig m_config; | 49 | protected GridConfig m_config; |
@@ -61,7 +62,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
61 | { | 62 | { |
62 | } | 63 | } |
63 | 64 | ||
64 | public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) | 65 | public void Initialise(string opensimVersion, IRegionProfileService gridDBService, IGridServiceCore gridCore, GridConfig config) |
65 | { | 66 | { |
66 | //m_opensimVersion = opensimVersion; | 67 | //m_opensimVersion = opensimVersion; |
67 | m_gridDBService = gridDBService; | 68 | 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 | |||
46 | { | 46 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | private GridDBService m_gridDBService; | 49 | private IRegionProfileService m_gridDBService; |
50 | private IGridServiceCore m_gridCore; | 50 | private IGridServiceCore m_gridCore; |
51 | 51 | ||
52 | protected GridConfig m_config; | 52 | protected GridConfig m_config; |
@@ -69,7 +69,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
69 | { | 69 | { |
70 | } | 70 | } |
71 | 71 | ||
72 | public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) | 72 | public void Initialise(string opensimVersion, IRegionProfileService gridDBService, IGridServiceCore gridCore, GridConfig config) |
73 | { | 73 | { |
74 | m_opensimVersion = opensimVersion; | 74 | m_opensimVersion = opensimVersion; |
75 | m_gridDBService = gridDBService; | 75 | m_gridDBService = gridDBService; |