diff options
author | Sean Dague | 2007-11-29 20:20:11 +0000 |
---|---|---|
committer | Sean Dague | 2007-11-29 20:20:11 +0000 |
commit | d3ab5ad506477bb7dbcff61893afc91aef931158 (patch) | |
tree | 2e3e94198f6f41d5b913036026227de56b31f26d | |
parent | return an appropriate inv_lib_root, which the libsl folks have (diff) | |
download | opensim-SC_OLD-d3ab5ad506477bb7dbcff61893afc91aef931158.zip opensim-SC_OLD-d3ab5ad506477bb7dbcff61893afc91aef931158.tar.gz opensim-SC_OLD-d3ab5ad506477bb7dbcff61893afc91aef931158.tar.bz2 opensim-SC_OLD-d3ab5ad506477bb7dbcff61893afc91aef931158.tar.xz |
revert r2510, this seems to break normal logins, at least from
Linux clients.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/LoginResponse.cs | 10 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 7 |
2 files changed, 1 insertions, 16 deletions
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs index dccba1c..98a6cfc 100644 --- a/OpenSim/Framework/Communications/LoginResponse.cs +++ b/OpenSim/Framework/Communications/LoginResponse.cs | |||
@@ -55,7 +55,6 @@ 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; | ||
59 | private ArrayList inventoryLibrary; | 58 | private ArrayList inventoryLibrary; |
60 | 59 | ||
61 | private UserInfo userProfile; | 60 | private UserInfo userProfile; |
@@ -283,7 +282,6 @@ namespace OpenSim.Framework.UserManagement | |||
283 | responseData["inventory-skeleton"] = agentInventory; | 282 | responseData["inventory-skeleton"] = agentInventory; |
284 | responseData["inventory-skel-lib"] = inventoryLibrary; | 283 | responseData["inventory-skel-lib"] = inventoryLibrary; |
285 | responseData["inventory-root"] = inventoryRoot; | 284 | responseData["inventory-root"] = inventoryRoot; |
286 | responseData["inventory-lib-root"] = inventoryLibRoot; | ||
287 | responseData["gestures"] = new ArrayList(); // todo | 285 | responseData["gestures"] = new ArrayList(); // todo |
288 | responseData["inventory-lib-owner"] = inventoryLibraryOwner; | 286 | responseData["inventory-lib-owner"] = inventoryLibraryOwner; |
289 | responseData["initial-outfit"] = initialOutfit; | 287 | responseData["initial-outfit"] = initialOutfit; |
@@ -507,12 +505,6 @@ namespace OpenSim.Framework.UserManagement | |||
507 | set { inventoryLibraryOwner = value; } | 505 | set { inventoryLibraryOwner = value; } |
508 | } | 506 | } |
509 | 507 | ||
510 | public ArrayList InventoryLibRoot | ||
511 | { | ||
512 | get { return inventoryLibRoot; } | ||
513 | set { inventoryLibRoot = value; } | ||
514 | } | ||
515 | |||
516 | public string Home | 508 | public string Home |
517 | { | 509 | { |
518 | get { return home; } | 510 | get { return home; } |
@@ -591,4 +583,4 @@ namespace OpenSim.Framework.UserManagement | |||
591 | } | 583 | } |
592 | } | 584 | } |
593 | } | 585 | } |
594 | } | 586 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 239bada..118668c 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -130,13 +130,6 @@ namespace OpenSim.Framework.UserManagement | |||
130 | logResponse.InventoryRoot = InventoryRoot; | 130 | logResponse.InventoryRoot = InventoryRoot; |
131 | logResponse.InventorySkeleton = AgentInventoryArray; | 131 | logResponse.InventorySkeleton = AgentInventoryArray; |
132 | logResponse.InventoryLibrary = GetInventoryLibrary(); | 132 | logResponse.InventoryLibrary = GetInventoryLibrary(); |
133 | |||
134 | Hashtable InventoryLibRootHash = new Hashtable(); | ||
135 | InventoryLibRootHash["folder_id"] = "00000112-000f-0000-0000-000100bba000"; | ||
136 | ArrayList InventoryLibRoot = new ArrayList(); | ||
137 | InventoryLibRoot.Add(InventoryLibRootHash); | ||
138 | logResponse.InventoryLibRoot = InventoryLibRoot; | ||
139 | |||
140 | logResponse.InventoryLibraryOwner = GetLibraryOwner(); | 133 | logResponse.InventoryLibraryOwner = GetLibraryOwner(); |
141 | logResponse.CircuitCode = (Int32)circode; | 134 | logResponse.CircuitCode = (Int32)circode; |
142 | //logResponse.RegionX = 0; //overwritten | 135 | //logResponse.RegionX = 0; //overwritten |