diff options
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/UserServer.Modules/UserLoginService.cs | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs index f3287a7..b354630 100644 --- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs +++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs | |||
@@ -364,68 +364,6 @@ namespace OpenSim.Grid.UserServer.Modules | |||
364 | return true; | 364 | return true; |
365 | } | 365 | } |
366 | 366 | ||
367 | // See LoginService | ||
368 | protected override InventoryData GetInventorySkeleton(UUID userID) | ||
369 | { | ||
370 | m_log.DebugFormat( | ||
371 | "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}", | ||
372 | m_config.InventoryUrl, userID); | ||
373 | |||
374 | List<InventoryFolderBase> folders = m_inventoryService.GetInventorySkeleton(userID); | ||
375 | |||
376 | if (null == folders || folders.Count == 0) | ||
377 | { | ||
378 | m_log.InfoFormat( | ||
379 | "[LOGIN]: A root inventory folder for user {0} was not found. Requesting creation.", userID); | ||
380 | |||
381 | // Although the create user function creates a new agent inventory along with a new user profile, some | ||
382 | // tools are creating the user profile directly in the database without creating the inventory. At | ||
383 | // this time we'll accomodate them by lazily creating the user inventory now if it doesn't already | ||
384 | // exist. | ||
385 | if (!m_inventoryService.CreateNewUserInventory(userID)) | ||
386 | { | ||
387 | throw new Exception( | ||
388 | String.Format( | ||
389 | "The inventory creation request for user {0} did not succeed." | ||
390 | + " Please contact your inventory service provider for more information.", | ||
391 | userID)); | ||
392 | } | ||
393 | m_log.InfoFormat("[LOGIN]: A new inventory skeleton was successfully created for user {0}", userID); | ||
394 | |||
395 | folders = m_inventoryService.GetInventorySkeleton(userID); | ||
396 | } | ||
397 | |||
398 | if (folders != null && folders.Count > 0) | ||
399 | { | ||
400 | UUID rootID = UUID.Zero; | ||
401 | ArrayList AgentInventoryArray = new ArrayList(); | ||
402 | Hashtable TempHash; | ||
403 | |||
404 | foreach (InventoryFolderBase InvFolder in folders) | ||
405 | { | ||
406 | // m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name); | ||
407 | |||
408 | if (InvFolder.ParentID == UUID.Zero) | ||
409 | { | ||
410 | rootID = InvFolder.ID; | ||
411 | } | ||
412 | TempHash = new Hashtable(); | ||
413 | TempHash["name"] = InvFolder.Name; | ||
414 | TempHash["parent_id"] = InvFolder.ParentID.ToString(); | ||
415 | TempHash["version"] = (Int32)InvFolder.Version; | ||
416 | TempHash["type_default"] = (Int32)InvFolder.Type; | ||
417 | TempHash["folder_id"] = InvFolder.ID.ToString(); | ||
418 | AgentInventoryArray.Add(TempHash); | ||
419 | } | ||
420 | |||
421 | return new InventoryData(AgentInventoryArray, rootID); | ||
422 | } | ||
423 | throw new Exception( | ||
424 | String.Format( | ||
425 | "A root inventory folder for user {0} could not be retrieved from the inventory service", | ||
426 | userID)); | ||
427 | } | ||
428 | |||
429 | public XmlRpcResponse XmlRPCSetLoginParams(XmlRpcRequest request) | 367 | public XmlRpcResponse XmlRPCSetLoginParams(XmlRpcRequest request) |
430 | { | 368 | { |
431 | XmlRpcResponse response = new XmlRpcResponse(); | 369 | XmlRpcResponse response = new XmlRpcResponse(); |