OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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)
afrisby
Sean Dague 2007-11-29 17:14:06 +00:00
parent 641e541967
commit af9eb87ad1
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/Communications/LoginResponse.cs
View File

@ -55,6 +55,7 @@ namespace OpenSim.Framework.UserManagement
private ArrayList initialOutfit; private ArrayList initialOutfit;
private ArrayList agentInventory; private ArrayList agentInventory;
private ArrayList inventoryLibraryOwner; private ArrayList inventoryLibraryOwner;
private ArrayList inventoryLibRoot;
private ArrayList inventoryLibrary; private ArrayList inventoryLibrary;
private UserInfo userProfile; private UserInfo userProfile;
@ -282,6 +283,7 @@ namespace OpenSim.Framework.UserManagement
responseData["inventory-skeleton"] = agentInventory; responseData["inventory-skeleton"] = agentInventory;
responseData["inventory-skel-lib"] = inventoryLibrary; responseData["inventory-skel-lib"] = inventoryLibrary;
responseData["inventory-root"] = inventoryRoot; responseData["inventory-root"] = inventoryRoot;
responseData["inventory-lib-root"] = inventoryLibRoot;
responseData["gestures"] = new ArrayList(); // todo responseData["gestures"] = new ArrayList(); // todo
responseData["inventory-lib-owner"] = inventoryLibraryOwner; responseData["inventory-lib-owner"] = inventoryLibraryOwner;
responseData["initial-outfit"] = initialOutfit; responseData["initial-outfit"] = initialOutfit;
@ -505,6 +507,12 @@ namespace OpenSim.Framework.UserManagement
set { inventoryLibraryOwner = value; } set { inventoryLibraryOwner = value; }
} }
public ArrayList InventoryLibRoot
{
get { return inventoryLibRoot; }
set { inventoryLibRoot = value; }
}
public string Home public string Home
{ {
get { return home; } get { return home; }
@ -583,4 +591,4 @@ namespace OpenSim.Framework.UserManagement
} }
} }
} }
} }

7
OpenSim/Framework/Communications/LoginService.cs
View File

@ -130,6 +130,13 @@ namespace OpenSim.Framework.UserManagement
logResponse.InventoryRoot = InventoryRoot; logResponse.InventoryRoot = InventoryRoot;
logResponse.InventorySkeleton = AgentInventoryArray; logResponse.InventorySkeleton = AgentInventoryArray;
logResponse.InventoryLibrary = GetInventoryLibrary(); logResponse.InventoryLibrary = GetInventoryLibrary();
Hashtable InventoryLibRootHash = new Hashtable();
InventoryLibRootHash["folder_id"] = "00000112-000f-0000-0000-000100bba000";
ArrayList InventoryLibRoot = new ArrayList();
InventoryLibRoot.Add(InventoryLibRootHash);
logResponse.InventoryLibRoot = InventoryLibRoot;
logResponse.InventoryLibraryOwner = GetLibraryOwner(); logResponse.InventoryLibraryOwner = GetLibraryOwner();
logResponse.CircuitCode = (Int32)circode; logResponse.CircuitCode = (Int32)circode;
//logResponse.RegionX = 0; //overwritten //logResponse.RegionX = 0; //overwritten