aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorlbsa712009-02-26 11:44:16 +0000
committerlbsa712009-02-26 11:44:16 +0000
commit82efceb4942ee11ba45ed61899774b22ff4c0426 (patch)
tree6b16d004fa95f6943d9f7569bb491bf13336c6ef /OpenSim/Grid
parentRenamed IMessageUserServerService to IInterServiceUserService.cs (diff)
downloadopensim-SC-82efceb4942ee11ba45ed61899774b22ff4c0426.zip
opensim-SC-82efceb4942ee11ba45ed61899774b22ff4c0426.tar.gz
opensim-SC-82efceb4942ee11ba45ed61899774b22ff4c0426.tar.bz2
opensim-SC-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)
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/GridServer.Modules/GridDBService.cs2
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserLoginService.cs4
2 files changed, 3 insertions, 3 deletions
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;