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

Make inventory items nominate explicit inventory folders rather than hardcoding

Browse Source
This commit is contained in:
Justin Clarke Casey
2007-12-29 19:41:50 +00:00
parent 1b1649791f
commit 40e89678b7
2 changed files with 64 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
View File

@@ -142,8 +142,10 @@ namespace OpenSim.Framework.Communications.Cache
item.avatarID = libOwner;
item.creatorsID = libOwner;
item.inventoryID =
new LLUUID(source.Configs[i].GetString("inventoryID", LLUUID.Random().ToString()));
new LLUUID(source.Configs[i].GetString("inventoryID", folderID.ToString()));
item.assetID = new LLUUID(source.Configs[i].GetString("assetID", LLUUID.Random().ToString()));
item.parentFolderID
= new LLUUID(source.Configs[i].GetString("folderID", LLUUID.Random().ToString()));
item.inventoryDescription = source.Configs[i].GetString("description", "");
item.inventoryName = source.Configs[i].GetString("name", "");
item.assetType = source.Configs[i].GetInt("assetType", 0);
@@ -152,16 +154,19 @@ namespace OpenSim.Framework.Communications.Cache
item.inventoryNextPermissions = (uint) source.Configs[i].GetLong("nextPermissions", 0x7FFFFFFF);
item.inventoryEveryOnePermissions = (uint) source.Configs[i].GetLong("everyonePermissions", 0x7FFFFFFF);
item.inventoryBasePermissions = (uint) source.Configs[i].GetLong("basePermissions", 0x7FFFFFFF);
if (item.assetType == 0)
if (item.parentFolderID == folderID)
{
item.parentFolderID = m_textureFolder.folderID;
m_textureFolder.Items.Add(item.inventoryID, item);
Items.Add(item.inventoryID, item);
}
else
{
item.parentFolderID = folderID;
Items.Add(item.inventoryID, item);
}
// Very temporary - will only work for immediate child folders
if (SubFolders.ContainsKey(item.parentFolderID))
{
SubFolders[item.parentFolderID].Items.Add(item.inventoryID, item);
}
}
}
}
}