diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/UserManager/LoginResponse.cs | 32 | ||||
-rw-r--r-- | OpenSim/Framework/UserManager/UserManagerBase.cs | 34 |
2 files changed, 64 insertions, 2 deletions
diff --git a/OpenSim/Framework/UserManager/LoginResponse.cs b/OpenSim/Framework/UserManager/LoginResponse.cs index 4d5ec5f..b5a4184 100644 --- a/OpenSim/Framework/UserManager/LoginResponse.cs +++ b/OpenSim/Framework/UserManager/LoginResponse.cs | |||
@@ -27,6 +27,8 @@ namespace OpenSim.Framework.UserManagement | |||
27 | private ArrayList inventoryRoot; | 27 | private ArrayList inventoryRoot; |
28 | private ArrayList initialOutfit; | 28 | private ArrayList initialOutfit; |
29 | private ArrayList agentInventory; | 29 | private ArrayList agentInventory; |
30 | private ArrayList inventoryLibraryOwner; | ||
31 | private ArrayList inventoryLibrary; | ||
30 | 32 | ||
31 | private UserInfo userProfile; | 33 | private UserInfo userProfile; |
32 | 34 | ||
@@ -87,6 +89,8 @@ namespace OpenSim.Framework.UserManagement | |||
87 | this.inventoryRoot = new ArrayList(); | 89 | this.inventoryRoot = new ArrayList(); |
88 | this.initialOutfit = new ArrayList(); | 90 | this.initialOutfit = new ArrayList(); |
89 | this.agentInventory = new ArrayList(); | 91 | this.agentInventory = new ArrayList(); |
92 | this.inventoryLibrary = new ArrayList(); | ||
93 | this.inventoryLibraryOwner = new ArrayList(); | ||
90 | 94 | ||
91 | this.xmlRpcResponse = new XmlRpcResponse(); | 95 | this.xmlRpcResponse = new XmlRpcResponse(); |
92 | this.defaultXmlRpcResponse = new XmlRpcResponse(); | 96 | this.defaultXmlRpcResponse = new XmlRpcResponse(); |
@@ -234,10 +238,10 @@ namespace OpenSim.Framework.UserManagement | |||
234 | responseData["ui-config"] = this.uiConfig; | 238 | responseData["ui-config"] = this.uiConfig; |
235 | 239 | ||
236 | responseData["inventory-skeleton"] = this.agentInventory; | 240 | responseData["inventory-skeleton"] = this.agentInventory; |
237 | responseData["inventory-skel-lib"] = new ArrayList(); // todo | 241 | responseData["inventory-skel-lib"] = this.inventoryLibrary; |
238 | responseData["inventory-root"] = this.inventoryRoot; | 242 | responseData["inventory-root"] = this.inventoryRoot; |
239 | responseData["gestures"] = new ArrayList(); // todo | 243 | responseData["gestures"] = new ArrayList(); // todo |
240 | responseData["inventory-lib-owner"] = new ArrayList(); // todo | 244 | responseData["inventory-lib-owner"] = this.inventoryLibraryOwner; |
241 | responseData["initial-outfit"] = this.initialOutfit; | 245 | responseData["initial-outfit"] = this.initialOutfit; |
242 | responseData["start_location"] = this.startLocation; | 246 | responseData["start_location"] = this.startLocation; |
243 | responseData["seed_capability"] = this.seedCapability; | 247 | responseData["seed_capability"] = this.seedCapability; |
@@ -600,6 +604,30 @@ namespace OpenSim.Framework.UserManagement | |||
600 | } | 604 | } |
601 | } | 605 | } |
602 | 606 | ||
607 | public ArrayList InventoryLibrary | ||
608 | { | ||
609 | get | ||
610 | { | ||
611 | return this.inventoryLibrary; | ||
612 | } | ||
613 | set | ||
614 | { | ||
615 | this.inventoryLibrary = value; | ||
616 | } | ||
617 | } | ||
618 | |||
619 | public ArrayList InventoryLibraryOwner | ||
620 | { | ||
621 | get | ||
622 | { | ||
623 | return this.inventoryLibraryOwner; | ||
624 | } | ||
625 | set | ||
626 | { | ||
627 | this.inventoryLibraryOwner = value; | ||
628 | } | ||
629 | } | ||
630 | |||
603 | public string Home | 631 | public string Home |
604 | { | 632 | { |
605 | get | 633 | get |
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs index a103f25..1acafeb 100644 --- a/OpenSim/Framework/UserManager/UserManagerBase.cs +++ b/OpenSim/Framework/UserManager/UserManagerBase.cs | |||
@@ -347,6 +347,38 @@ namespace OpenSim.Framework.UserManagement | |||
347 | } | 347 | } |
348 | 348 | ||
349 | /// <summary> | 349 | /// <summary> |
350 | /// | ||
351 | /// </summary> | ||
352 | /// <returns></returns> | ||
353 | protected virtual ArrayList GetInventoryLibrary() | ||
354 | { | ||
355 | //return new ArrayList(); | ||
356 | Hashtable TempHash = new Hashtable(); | ||
357 | TempHash["name"] = "OpenSim Library"; | ||
358 | TempHash["parent_id"] = LLUUID.Zero.ToStringHyphenated(); | ||
359 | TempHash["version"] = "1"; | ||
360 | TempHash["type_default"] = "-1"; | ||
361 | TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba000"; | ||
362 | ArrayList temp = new ArrayList(); | ||
363 | temp.Add(TempHash); | ||
364 | return temp; | ||
365 | } | ||
366 | |||
367 | /// <summary> | ||
368 | /// | ||
369 | /// </summary> | ||
370 | /// <returns></returns> | ||
371 | protected virtual ArrayList GetLibraryOwner() | ||
372 | { | ||
373 | //for now create random inventory library owner | ||
374 | Hashtable TempHash = new Hashtable(); | ||
375 | TempHash["agent_id"] = "11111111-1111-0000-0000-000100bba000"; | ||
376 | ArrayList inventoryLibOwner = new ArrayList(); | ||
377 | inventoryLibOwner.Add(TempHash); | ||
378 | return inventoryLibOwner; | ||
379 | } | ||
380 | |||
381 | /// <summary> | ||
350 | /// Customises the login response and fills in missing values. | 382 | /// Customises the login response and fills in missing values. |
351 | /// </summary> | 383 | /// </summary> |
352 | /// <param name="response">The existing response</param> | 384 | /// <param name="response">The existing response</param> |
@@ -446,6 +478,8 @@ namespace OpenSim.Framework.UserManagement | |||
446 | logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToStringHyphenated(); | 478 | logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToStringHyphenated(); |
447 | logResponse.InventoryRoot = InventoryRoot; | 479 | logResponse.InventoryRoot = InventoryRoot; |
448 | logResponse.InventorySkeleton = AgentInventoryArray; | 480 | logResponse.InventorySkeleton = AgentInventoryArray; |
481 | logResponse.InventoryLibrary = this.GetInventoryLibrary(); | ||
482 | logResponse.InventoryLibraryOwner = this.GetLibraryOwner(); | ||
449 | logResponse.CircuitCode = (Int32)circode; | 483 | logResponse.CircuitCode = (Int32)circode; |
450 | //logResponse.RegionX = 0; //overwritten | 484 | //logResponse.RegionX = 0; //overwritten |
451 | //logResponse.RegionY = 0; //overwritten | 485 | //logResponse.RegionY = 0; //overwritten |