diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index 35e2826..6923293 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
@@ -46,7 +46,7 @@ namespace OpenSim.Services.UserAccountService | |||
46 | 46 | ||
47 | protected IGridService m_GridService; | 47 | protected IGridService m_GridService; |
48 | protected IAuthenticationService m_AuthenticationService; | 48 | protected IAuthenticationService m_AuthenticationService; |
49 | protected IPresenceService m_PresenceService; | 49 | protected IGridUserService m_GridUserService; |
50 | protected IInventoryService m_InventoryService; | 50 | protected IInventoryService m_InventoryService; |
51 | 51 | ||
52 | public UserAccountService(IConfigSource config) | 52 | public UserAccountService(IConfigSource config) |
@@ -69,9 +69,9 @@ namespace OpenSim.Services.UserAccountService | |||
69 | if (authServiceDll != string.Empty) | 69 | if (authServiceDll != string.Empty) |
70 | m_AuthenticationService = LoadPlugin<IAuthenticationService>(authServiceDll, new Object[] { config }); | 70 | m_AuthenticationService = LoadPlugin<IAuthenticationService>(authServiceDll, new Object[] { config }); |
71 | 71 | ||
72 | string presenceServiceDll = userConfig.GetString("PresenceService", string.Empty); | 72 | string presenceServiceDll = userConfig.GetString("GridUserService", string.Empty); |
73 | if (presenceServiceDll != string.Empty) | 73 | if (presenceServiceDll != string.Empty) |
74 | m_PresenceService = LoadPlugin<IPresenceService>(presenceServiceDll, new Object[] { config }); | 74 | m_GridUserService = LoadPlugin<IGridUserService>(presenceServiceDll, new Object[] { config }); |
75 | 75 | ||
76 | string invServiceDll = userConfig.GetString("InventoryService", string.Empty); | 76 | string invServiceDll = userConfig.GetString("InventoryService", string.Empty); |
77 | if (invServiceDll != string.Empty) | 77 | if (invServiceDll != string.Empty) |
@@ -333,8 +333,8 @@ namespace OpenSim.Services.UserAccountService | |||
333 | if (defaultRegions != null && defaultRegions.Count >= 1) | 333 | if (defaultRegions != null && defaultRegions.Count >= 1) |
334 | home = defaultRegions[0]; | 334 | home = defaultRegions[0]; |
335 | 335 | ||
336 | if (m_PresenceService != null && home != null) | 336 | if (m_GridUserService != null && home != null) |
337 | m_PresenceService.SetHomeLocation(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0)); | 337 | m_GridUserService.SetHome(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0)); |
338 | else | 338 | else |
339 | m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to set home for account {0} {1}.", | 339 | m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to set home for account {0} {1}.", |
340 | firstName, lastName); | 340 | firstName, lastName); |