ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
This commit is contained in:
Melanie
2013-01-02 11:52:37 +00:00
parent 7e98dfd70b aa236b2020
commit 7943c8d11c
40 changed files with 4620 additions and 1955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Services/InventoryService/XInventoryService.cs
View File

@@ -219,9 +219,15 @@ namespace OpenSim.Services.InventoryService
XInventoryFolder root = null;
foreach (XInventoryFolder folder in folders)
{
if (folder.folderName == "My Inventory")
{
root = folder;
if (folders == null) // oops
break;
}
}
if (root == null) // oops
root = folders[0];
return ConvertToOpenSim(root);
@@ -249,6 +255,9 @@ namespace OpenSim.Services.InventoryService
{
// m_log.DebugFormat("[XINVENTORY SERVICE]: Getting folder type {0} for user {1}", type, principalID);
if (type == AssetType.RootFolder)
return rootFolder;
XInventoryFolder[] folders = m_Database.GetFolders(
new string[] { "agentID", "parentFolderID", "type"},
new string[] { rootFolder.Owner.ToString(), rootFolder.ID.ToString(), ((int)type).ToString() });