diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 7dce157..b11714a 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -59,15 +59,17 @@ 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 | 63 | ||
63 | public UserLoginService( | 64 | public UserLoginService( |
64 | UserManagerBase userManager, IInterServiceInventoryServices inventoryService, | 65 | UserManagerBase userManager, IInterServiceInventoryServices inventoryService, |
65 | LibraryRootFolder libraryRootFolder, | 66 | LibraryRootFolder libraryRootFolder, |
66 | UserConfig config, string welcomeMess) | 67 | UserConfig config, string welcomeMess, RegionProfileService regionProfileService) |
67 | : base(userManager, libraryRootFolder, welcomeMess) | 68 | : base(userManager, libraryRootFolder, welcomeMess) |
68 | { | 69 | { |
69 | m_config = config; | 70 | m_config = config; |
70 | m_inventoryService = inventoryService; | 71 | m_inventoryService = inventoryService; |
72 | m_regionProfileService = regionProfileService; | ||
71 | } | 73 | } |
72 | 74 | ||
73 | public void setloginlevel(int level) | 75 | public void setloginlevel(int level) |
@@ -86,7 +88,7 @@ namespace OpenSim.Grid.UserServer | |||
86 | RegionProfileData SimInfo; | 88 | RegionProfileData SimInfo; |
87 | try | 89 | try |
88 | { | 90 | { |
89 | SimInfo = RegionProfileService.RequestSimProfileData( | 91 | SimInfo = m_regionProfileService.RequestSimProfileData( |
90 | theUser.CurrentAgent.Handle, m_config.GridServerURL, | 92 | theUser.CurrentAgent.Handle, m_config.GridServerURL, |
91 | m_config.GridSendKey, m_config.GridRecvKey); | 93 | m_config.GridSendKey, m_config.GridRecvKey); |
92 | 94 | ||
@@ -302,20 +304,20 @@ namespace OpenSim.Grid.UserServer | |||
302 | 304 | ||
303 | protected RegionProfileData RequestClosestRegion(string region) | 305 | protected RegionProfileData RequestClosestRegion(string region) |
304 | { | 306 | { |
305 | return RegionProfileService.RequestSimProfileData(region, | 307 | return m_regionProfileService.RequestSimProfileData(region, |
306 | m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey); | 308 | m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey); |
307 | } | 309 | } |
308 | 310 | ||
309 | protected RegionProfileData GetRegionInfo(ulong homeRegionHandle) | 311 | protected RegionProfileData GetRegionInfo(ulong homeRegionHandle) |
310 | { | 312 | { |
311 | return RegionProfileService.RequestSimProfileData(homeRegionHandle, | 313 | return m_regionProfileService.RequestSimProfileData(homeRegionHandle, |
312 | m_config.GridServerURL, m_config.GridSendKey, | 314 | m_config.GridServerURL, m_config.GridSendKey, |
313 | m_config.GridRecvKey); | 315 | m_config.GridRecvKey); |
314 | } | 316 | } |
315 | 317 | ||
316 | protected RegionProfileData GetRegionInfo(UUID homeRegionId) | 318 | protected RegionProfileData GetRegionInfo(UUID homeRegionId) |
317 | { | 319 | { |
318 | return RegionProfileService.RequestSimProfileData(homeRegionId, | 320 | return m_regionProfileService.RequestSimProfileData(homeRegionId, |
319 | m_config.GridServerURL, m_config.GridSendKey, | 321 | m_config.GridServerURL, m_config.GridSendKey, |
320 | m_config.GridRecvKey); | 322 | m_config.GridRecvKey); |
321 | } | 323 | } |