diff --git a/OpenSim/Data/IRegionProfileService.cs b/OpenSim/Data/IRegionProfileService.cs
index 0f0ca6f2f6..7a2b46f1d5 100644
--- a/OpenSim/Data/IRegionProfileService.cs
+++ b/OpenSim/Data/IRegionProfileService.cs
@@ -33,6 +33,30 @@ using OpenMetaverse;
namespace OpenSim.Data
{
public interface IRegionProfileService
+ {
+ ///
+ /// Returns a region by argument
+ ///
+ /// A UUID key of the region to return
+ /// A SimProfileData for the region
+ RegionProfileData GetRegion(UUID uuid);
+
+ ///
+ /// Returns a region by argument
+ ///
+ /// A regionHandle of the region to return
+ /// A SimProfileData for the region
+ RegionProfileData GetRegion(ulong handle);
+
+ ///
+ /// Returns a region by argument
+ ///
+ /// A partial regionName of the region to return
+ /// A SimProfileData for the region
+ RegionProfileData GetRegion(string regionName);
+ }
+
+ public interface IRegionProfileRouter
{
///
/// Request sim profile information from a grid server, by Region UUID
diff --git a/OpenSim/Data/RegionProfileServiceProxy.cs b/OpenSim/Data/RegionProfileServiceProxy.cs
index d0072d1c93..126e3639da 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
{
///
/// 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 22742147cc..7374e2fbd5 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 64ac463e5f..95e58a8729 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;