diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 46a5c18..b61b5e8 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -58,6 +58,7 @@ namespace OpenSim.Services.LLLoginService | |||
58 | protected IGridUserService m_GridUserService; | 58 | protected IGridUserService m_GridUserService; |
59 | protected IAuthenticationService m_AuthenticationService; | 59 | protected IAuthenticationService m_AuthenticationService; |
60 | protected IInventoryService m_InventoryService; | 60 | protected IInventoryService m_InventoryService; |
61 | protected IInventoryService m_HGInventoryService; | ||
61 | protected IGridService m_GridService; | 62 | protected IGridService m_GridService; |
62 | protected IPresenceService m_PresenceService; | 63 | protected IPresenceService m_PresenceService; |
63 | protected ISimulationService m_LocalSimulationService; | 64 | protected ISimulationService m_LocalSimulationService; |
@@ -165,6 +166,15 @@ namespace OpenSim.Services.LLLoginService | |||
165 | if (agentService != string.Empty) | 166 | if (agentService != string.Empty) |
166 | m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(agentService, args); | 167 | m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(agentService, args); |
167 | 168 | ||
169 | // Get the Hypergrid inventory service (exists only if Hypergrid is enabled) | ||
170 | string hgInvServicePlugin = m_LoginServerConfig.GetString("HGInventoryServicePlugin", String.Empty); | ||
171 | if (hgInvServicePlugin != string.Empty) | ||
172 | { | ||
173 | string hgInvServiceArg = m_LoginServerConfig.GetString("HGInventoryServiceConstructorArg", String.Empty); | ||
174 | Object[] args2 = new Object[] { config, hgInvServiceArg }; | ||
175 | m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvServicePlugin, args2); | ||
176 | } | ||
177 | |||
168 | // | 178 | // |
169 | // deal with the services given as argument | 179 | // deal with the services given as argument |
170 | // | 180 | // |
@@ -350,6 +360,13 @@ namespace OpenSim.Services.LLLoginService | |||
350 | return LLFailedLoginResponse.InventoryProblem; | 360 | return LLFailedLoginResponse.InventoryProblem; |
351 | } | 361 | } |
352 | 362 | ||
363 | if (m_HGInventoryService != null) | ||
364 | { | ||
365 | // Give the Suitcase service a chance to create the suitcase folder. | ||
366 | // (If we're not using the Suitcase inventory service then this won't do anything.) | ||
367 | m_HGInventoryService.GetRootFolder(account.PrincipalID); | ||
368 | } | ||
369 | |||
353 | List<InventoryFolderBase> inventorySkel = m_InventoryService.GetInventorySkeleton(account.PrincipalID); | 370 | List<InventoryFolderBase> inventorySkel = m_InventoryService.GetInventorySkeleton(account.PrincipalID); |
354 | if (m_RequireInventory && ((inventorySkel == null) || (inventorySkel != null && inventorySkel.Count == 0))) | 371 | if (m_RequireInventory && ((inventorySkel == null) || (inventorySkel != null && inventorySkel.Count == 0))) |
355 | { | 372 | { |