aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorSean Dague2007-11-29 17:14:06 +0000
committerSean Dague2007-11-29 17:14:06 +0000
commitaf9eb87ad1cad8c5d9b0ca3ba04dc14a12e95021 (patch)
treeecbdf1b90624e10ce14122c88245d059082705ea /OpenSim/Framework
parentadd a few more parens to make sure that throttling condition (diff)
downloadopensim-SC_OLD-af9eb87ad1cad8c5d9b0ca3ba04dc14a12e95021.zip
opensim-SC_OLD-af9eb87ad1cad8c5d9b0ca3ba04dc14a12e95021.tar.gz
opensim-SC_OLD-af9eb87ad1cad8c5d9b0ca3ba04dc14a12e95021.tar.bz2
opensim-SC_OLD-af9eb87ad1cad8c5d9b0ca3ba04dc14a12e95021.tar.xz
return an appropriate inv_lib_root, which the libsl folks have
identified as the reason libsl can't currently connect to OpenSim. Patch from Justin Casey (IBM)
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs10
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs7
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 118668c..239bada 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -130,6 +130,13 @@ 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
133 logResponse.InventoryLibraryOwner = GetLibraryOwner(); 140 logResponse.InventoryLibraryOwner = GetLibraryOwner();
134 logResponse.CircuitCode = (Int32)circode; 141 logResponse.CircuitCode = (Int32)circode;
135 //logResponse.RegionX = 0; //overwritten 142 //logResponse.RegionX = 0; //overwritten