* 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)

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
     public interface IRegionProfileService
     {
         /// <summary>
+        /// Returns a region by argument
+        /// </summary>
+        /// <param name="uuid">A UUID key of the region to return</param>
+        /// <returns>A SimProfileData for the region</returns>
+        RegionProfileData GetRegion(UUID uuid);
+
+        /// <summary>
+        /// Returns a region by argument
+        /// </summary>
+        /// <param name="uuid">A regionHandle of the region to return</param>
+        /// <returns>A SimProfileData for the region</returns>
+        RegionProfileData GetRegion(ulong handle);
+
+        /// <summary>
+        /// Returns a region by argument
+        /// </summary>
+        /// <param name="regionName">A partial regionName of the region to return</param>
+        /// <returns>A SimProfileData for the region</returns>
+        RegionProfileData GetRegion(string regionName);
+    }
+
+    public interface IRegionProfileRouter
+    {
+        /// <summary>
         /// Request sim profile information from a grid server, by Region UUID
         /// </summary>
         /// <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;
 
 namespace OpenSim.Data
 {
-    public class RegionProfileServiceProxy : IRegionProfileService
+    public class RegionProfileServiceProxy : IRegionProfileRouter
     {
         /// <summary>
         /// 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;
 
 namespace OpenSim.Grid.GridServer.Modules
 {
-    public class GridDBService
+    public class GridDBService : IRegionProfileService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
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
         private UserLoggedInAtLocation handlerUserLoggedInAtLocation;
 
         public UserConfig m_config;
-        private readonly IRegionProfileService m_regionProfileService;
+        private readonly IRegionProfileRouter m_regionProfileService;
 
         protected BaseHttpServer m_httpServer;
 
         public UserLoginService(
             UserManagerBase userManager, IInterServiceInventoryServices inventoryService,
             LibraryRootFolder libraryRootFolder,
-            UserConfig config, string welcomeMess, IRegionProfileService regionProfileService)
+            UserConfig config, string welcomeMess, IRegionProfileRouter regionProfileService)
             : base(userManager, libraryRootFolder, welcomeMess)
         {
             m_config = config;