diff options
author | lbsa71 | 2009-02-12 10:21:21 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-12 10:21:21 +0000 |
commit | 61878884569f9c01b6324f9a9d9fbcac7034f536 (patch) | |
tree | 1871310b7bb4d4463feb5f456123305101090096 /OpenSim/Grid | |
parent | * Turned RegionProfileService non-static (diff) | |
download | opensim-SC-61878884569f9c01b6324f9a9d9fbcac7034f536.zip opensim-SC-61878884569f9c01b6324f9a9d9fbcac7034f536.tar.gz opensim-SC-61878884569f9c01b6324f9a9d9fbcac7034f536.tar.bz2 opensim-SC-61878884569f9c01b6324f9a9d9fbcac7034f536.tar.xz |
* Renamed RegionProfileService to RegionProfileServiceProxy to better reflect actual use.
* Added IRegionProfileService
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 70aaea3..2199e93 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -168,7 +168,7 @@ namespace OpenSim.Grid.UserServer | |||
168 | protected virtual void StartupLoginService(IInterServiceInventoryServices inventoryService) | 168 | protected virtual void StartupLoginService(IInterServiceInventoryServices inventoryService) |
169 | { | 169 | { |
170 | m_loginService = new UserLoginService( | 170 | m_loginService = new UserLoginService( |
171 | m_userManager, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile), Cfg, Cfg.DefaultStartupMsg, new RegionProfileService()); | 171 | m_userManager, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile), Cfg, Cfg.DefaultStartupMsg, new RegionProfileServiceProxy()); |
172 | } | 172 | } |
173 | 173 | ||
174 | protected virtual void AddHttpHandlers() | 174 | protected virtual void AddHttpHandlers() |
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index b11714a..d069e1a 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -59,12 +59,12 @@ namespace OpenSim.Grid.UserServer | |||
59 | private UserLoggedInAtLocation handlerUserLoggedInAtLocation; | 59 | private UserLoggedInAtLocation handlerUserLoggedInAtLocation; |
60 | 60 | ||
61 | public UserConfig m_config; | 61 | public UserConfig m_config; |
62 | private readonly RegionProfileService m_regionProfileService; | 62 | private readonly IRegionProfileService m_regionProfileService; |
63 | 63 | ||
64 | public UserLoginService( | 64 | public UserLoginService( |
65 | UserManagerBase userManager, IInterServiceInventoryServices inventoryService, | 65 | UserManagerBase userManager, IInterServiceInventoryServices inventoryService, |
66 | LibraryRootFolder libraryRootFolder, | 66 | LibraryRootFolder libraryRootFolder, |
67 | UserConfig config, string welcomeMess, RegionProfileService regionProfileService) | 67 | UserConfig config, string welcomeMess, IRegionProfileService regionProfileService) |
68 | : base(userManager, libraryRootFolder, welcomeMess) | 68 | : base(userManager, libraryRootFolder, welcomeMess) |
69 | { | 69 | { |
70 | m_config = config; | 70 | m_config = config; |