diff options
author | Sean Dague | 2007-11-30 15:27:56 +0000 |
---|---|---|
committer | Sean Dague | 2007-11-30 15:27:56 +0000 |
commit | d2fe290bb6fe52e40799b4b258564b7bf9f9aed2 (patch) | |
tree | 0594bbb20336f628ea0e9b68aa07b36948e49473 /OpenSim | |
parent | added support for a console command script to be ran every 20 minutes (will m... (diff) | |
download | opensim-SC-d2fe290bb6fe52e40799b4b258564b7bf9f9aed2.zip opensim-SC-d2fe290bb6fe52e40799b4b258564b7bf9f9aed2.tar.gz opensim-SC-d2fe290bb6fe52e40799b4b258564b7bf9f9aed2.tar.bz2 opensim-SC-d2fe290bb6fe52e40799b4b258564b7bf9f9aed2.tar.xz |
return of the inv-lib-root patch from Justin Casey (IBM)
Should fix libsl login ability. No long breaks my login
to test environment.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/Communications/LoginResponse.cs | 10 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 7 |
2 files changed, 16 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs index 98a6cfc..dccba1c 100644 --- a/OpenSim/Framework/Communications/LoginResponse.cs +++ b/OpenSim/Framework/Communications/LoginResponse.cs | |||
@@ -55,6 +55,7 @@ namespace OpenSim.Framework.UserManagement | |||
55 | private ArrayList initialOutfit; | 55 | private ArrayList initialOutfit; |
56 | private ArrayList agentInventory; | 56 | private ArrayList agentInventory; |
57 | private ArrayList inventoryLibraryOwner; | 57 | private ArrayList inventoryLibraryOwner; |
58 | private ArrayList inventoryLibRoot; | ||
58 | private ArrayList inventoryLibrary; | 59 | private ArrayList inventoryLibrary; |
59 | 60 | ||
60 | private UserInfo userProfile; | 61 | private UserInfo userProfile; |
@@ -282,6 +283,7 @@ namespace OpenSim.Framework.UserManagement | |||
282 | responseData["inventory-skeleton"] = agentInventory; | 283 | responseData["inventory-skeleton"] = agentInventory; |
283 | responseData["inventory-skel-lib"] = inventoryLibrary; | 284 | responseData["inventory-skel-lib"] = inventoryLibrary; |
284 | responseData["inventory-root"] = inventoryRoot; | 285 | responseData["inventory-root"] = inventoryRoot; |
286 | responseData["inventory-lib-root"] = inventoryLibRoot; | ||
285 | responseData["gestures"] = new ArrayList(); // todo | 287 | responseData["gestures"] = new ArrayList(); // todo |
286 | responseData["inventory-lib-owner"] = inventoryLibraryOwner; | 288 | responseData["inventory-lib-owner"] = inventoryLibraryOwner; |
287 | responseData["initial-outfit"] = initialOutfit; | 289 | responseData["initial-outfit"] = initialOutfit; |
@@ -505,6 +507,12 @@ namespace OpenSim.Framework.UserManagement | |||
505 | set { inventoryLibraryOwner = value; } | 507 | set { inventoryLibraryOwner = value; } |
506 | } | 508 | } |
507 | 509 | ||
510 | public ArrayList InventoryLibRoot | ||
511 | { | ||
512 | get { return inventoryLibRoot; } | ||
513 | set { inventoryLibRoot = value; } | ||
514 | } | ||
515 | |||
508 | public string Home | 516 | public string Home |
509 | { | 517 | { |
510 | get { return home; } | 518 | get { return home; } |
@@ -583,4 +591,4 @@ namespace OpenSim.Framework.UserManagement | |||
583 | } | 591 | } |
584 | } | 592 | } |
585 | } | 593 | } |
586 | } \ No newline at end of file | 594 | } |
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 1d53669..4c33bd8 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -135,6 +135,13 @@ namespace OpenSim.Framework.UserManagement | |||
135 | logResponse.InventoryRoot = InventoryRoot; | 135 | logResponse.InventoryRoot = InventoryRoot; |
136 | logResponse.InventorySkeleton = AgentInventoryArray; | 136 | logResponse.InventorySkeleton = AgentInventoryArray; |
137 | logResponse.InventoryLibrary = GetInventoryLibrary(); | 137 | logResponse.InventoryLibrary = GetInventoryLibrary(); |
138 | |||
139 | Hashtable InventoryLibRootHash = new Hashtable(); | ||
140 | InventoryLibRootHash["folder_id"] = "00000112-000f-0000-0000-000100bba000"; | ||
141 | ArrayList InventoryLibRoot = new ArrayList(); | ||
142 | InventoryLibRoot.Add(InventoryLibRootHash); | ||
143 | logResponse.InventoryLibRoot = InventoryLibRoot; | ||
144 | |||
138 | logResponse.InventoryLibraryOwner = GetLibraryOwner(); | 145 | logResponse.InventoryLibraryOwner = GetLibraryOwner(); |
139 | logResponse.CircuitCode = (Int32)circode; | 146 | logResponse.CircuitCode = (Int32)circode; |
140 | //logResponse.RegionX = 0; //overwritten | 147 | //logResponse.RegionX = 0; //overwritten |