aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer.Modules
diff options
context:
space:
mode:
authorlbsa712009-03-20 17:25:12 +0000
committerlbsa712009-03-20 17:25:12 +0000
commit613201e22045166d5a22f7bc1ef75ebe6639b1de (patch)
tree63ffa8749297b61318d78b6911d5ef21d8d60351 /OpenSim/Grid/UserServer.Modules
parentEnsure the remembered velocity is zero when physical is turned off on a prim.... (diff)
downloadopensim-SC_OLD-613201e22045166d5a22f7bc1ef75ebe6639b1de.zip
opensim-SC_OLD-613201e22045166d5a22f7bc1ef75ebe6639b1de.tar.gz
opensim-SC_OLD-613201e22045166d5a22f7bc1ef75ebe6639b1de.tar.bz2
opensim-SC_OLD-613201e22045166d5a22f7bc1ef75ebe6639b1de.tar.xz
* Normalized and pulled GetInventorySkeleton up.
Diffstat (limited to 'OpenSim/Grid/UserServer.Modules')
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserLoginService.cs62
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();