aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712009-02-26 11:44:16 +0000
committerlbsa712009-02-26 11:44:16 +0000
commit82efceb4942ee11ba45ed61899774b22ff4c0426 (patch)
tree6b16d004fa95f6943d9f7569bb491bf13336c6ef
parentRenamed IMessageUserServerService to IInterServiceUserService.cs (diff)
downloadopensim-SC_OLD-82efceb4942ee11ba45ed61899774b22ff4c0426.zip
opensim-SC_OLD-82efceb4942ee11ba45ed61899774b22ff4c0426.tar.gz
opensim-SC_OLD-82efceb4942ee11ba45ed61899774b22ff4c0426.tar.bz2
opensim-SC_OLD-82efceb4942ee11ba45ed61899774b22ff4c0426.tar.xz
* renamed IRegionProfileService to IRegionProfileRouter to better reflect use (naming is a work in progress...)
* introduced new IRegionProfileService that is going to be _one_ profileService * Had GridDBService inherit the IRegionProfileService (preparing for re-wiring things and de-duplicating eventually)
-rw-r--r--OpenSim/Data/IRegionProfileService.cs24
-rw-r--r--OpenSim/Data/RegionProfileServiceProxy.cs2
-rw-r--r--OpenSim/Grid/GridServer.Modules/GridDBService.cs2
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserLoginService.cs4
4 files changed, 28 insertions, 4 deletions
diff --git a/OpenSim/Data/IRegionProfileService.cs b/OpenSim/Data/IRegionProfileService.cs
index 0f0ca6f..7a2b46f 100644
--- a/OpenSim/Data/IRegionProfileService.cs
+++ b/OpenSim/Data/IRegionProfileService.cs
@@ -35,6 +35,30 @@ namespace OpenSim.Data
35 public interface IRegionProfileService 35 public interface IRegionProfileService
36 { 36 {
37 /// <summary> 37 /// <summary>
38 /// Returns a region by argument
39 /// </summary>
40 /// <param name="uuid">A UUID key of the region to return</param>
41 /// <returns>A SimProfileData for the region</returns>
42 RegionProfileData GetRegion(UUID uuid);
43
44 /// <summary>
45 /// Returns a region by argument
46 /// </summary>
47 /// <param name="uuid">A regionHandle of the region to return</param>
48 /// <returns>A SimProfileData for the region</returns>
49 RegionProfileData GetRegion(ulong handle);
50
51 /// <summary>
52 /// Returns a region by argument
53 /// </summary>
54 /// <param name="regionName">A partial regionName of the region to return</param>
55 /// <returns>A SimProfileData for the region</returns>
56 RegionProfileData GetRegion(string regionName);
57 }
58
59 public interface IRegionProfileRouter
60 {
61 /// <summary>
38 /// Request sim profile information from a grid server, by Region UUID 62 /// Request sim profile information from a grid server, by Region UUID
39 /// </summary> 63 /// </summary>
40 /// <param name="regionId">The region UUID to look for</param> 64 /// <param name="regionId">The region UUID to look for</param>
diff --git a/OpenSim/Data/RegionProfileServiceProxy.cs b/OpenSim/Data/RegionProfileServiceProxy.cs
index d0072d1..126e363 100644
--- a/OpenSim/Data/RegionProfileServiceProxy.cs
+++ b/OpenSim/Data/RegionProfileServiceProxy.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
35 35
36namespace OpenSim.Data 36namespace OpenSim.Data
37{ 37{
38 public class RegionProfileServiceProxy : IRegionProfileService 38 public class RegionProfileServiceProxy : IRegionProfileRouter
39 { 39 {
40 /// <summary> 40 /// <summary>
41 /// Request sim data based on arbitrary key/value 41 /// Request sim data based on arbitrary key/value
diff --git a/OpenSim/Grid/GridServer.Modules/GridDBService.cs b/OpenSim/Grid/GridServer.Modules/GridDBService.cs
index 2274214..7374e2f 100644
--- a/OpenSim/Grid/GridServer.Modules/GridDBService.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridDBService.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Servers;
42 42
43namespace OpenSim.Grid.GridServer.Modules 43namespace OpenSim.Grid.GridServer.Modules
44{ 44{
45 public class GridDBService 45 public class GridDBService : IRegionProfileService
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
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
index 64ac463..95e58a8 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
@@ -60,14 +60,14 @@ namespace OpenSim.Grid.UserServer.Modules
60 private UserLoggedInAtLocation handlerUserLoggedInAtLocation; 60 private UserLoggedInAtLocation handlerUserLoggedInAtLocation;
61 61
62 public UserConfig m_config; 62 public UserConfig m_config;
63 private readonly IRegionProfileService m_regionProfileService; 63 private readonly IRegionProfileRouter m_regionProfileService;
64 64
65 protected BaseHttpServer m_httpServer; 65 protected BaseHttpServer m_httpServer;
66 66
67 public UserLoginService( 67 public UserLoginService(
68 UserManagerBase userManager, IInterServiceInventoryServices inventoryService, 68 UserManagerBase userManager, IInterServiceInventoryServices inventoryService,
69 LibraryRootFolder libraryRootFolder, 69 LibraryRootFolder libraryRootFolder,
70 UserConfig config, string welcomeMess, IRegionProfileService regionProfileService) 70 UserConfig config, string welcomeMess, IRegionProfileRouter regionProfileService)
71 : base(userManager, libraryRootFolder, welcomeMess) 71 : base(userManager, libraryRootFolder, welcomeMess)
72 { 72 {
73 m_config = config; 73 m_config = config;