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

* Refactor GetUsersInventory()

0.6.0-stable
Justin Clarke Casey 2008-04-10 16:04:19 +00:00
parent f565f44d89
commit 5ad4c79a4e
3 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Communications/IInventoryServices.cs
View File

@ -85,8 +85,8 @@ namespace OpenSim.Framework.Communications
/// Returns a list of all the folders in a given user's inventory.
/// </summary>
/// <param name="userId"></param>
/// <returns>A flat list of the user's inventory folder tree.
/// Null if there is no inventory for this user</returns>
/// <returns>A flat list of the user's inventory folder tree,
/// null if there is no inventory for this user</returns>
List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId);
}
}

2
OpenSim/Framework/Communications/InventoryServiceBase.cs
View File

@ -141,7 +141,7 @@ namespace OpenSim.Framework.Communications
if (null != existingRootFolder)
{
m_log.ErrorFormat(
m_log.WarnFormat(
"[AGENT INVENTORY]: Did not create a new inventory for user {0} since they already have "
+ "a root inventory folder with id {1}",
user, existingRootFolder.ID);

42
OpenSim/Grid/InventoryServer/GridInventoryService.cs
View File

@ -43,7 +43,14 @@ namespace OpenSim.Grid.InventoryServer
{
}
private bool TryGetUsersInventory(LLUUID userID, out List<InventoryFolderBase> folderList,
/// <summary>
/// Get a user's inventory.
/// </summary>
/// <param name="userID"></param>
/// <param name="folderList"></param>
/// <param name="itemsList"></param>
/// <returns>true if the inventory was retrieved, false otherwise</returns>
private bool GetUsersInventory(LLUUID userID, out List<InventoryFolderBase> folderList,
out List<InventoryItemBase> itemsList)
{
List<InventoryFolderBase> allFolders = GetInventorySkeleton(userID);
@ -93,23 +100,40 @@ namespace OpenSim.Grid.InventoryServer
/// Return a user's entire inventory
/// </summary>
/// <param name="rawUserID"></param>
/// <returns></returns>
/// <returns>The user's inventory. If an inventory cannot be found then an empty collection is returned.</returns>
public InventoryCollection GetUserInventory(Guid rawUserID)
{
LLUUID userID = new LLUUID(rawUserID);
m_log.Info("[AGENT INVENTORY]: Processing request for inventory of " + userID.ToString());
m_log.InfoFormat("[AGENT INVENTORY]: Processing request for inventory of {0}", userID);
InventoryCollection invCollection = new InventoryCollection();
List<InventoryFolderBase> folders;
List<InventoryItemBase> allItems;
if (TryGetUsersInventory(userID, out folders, out allItems))
List<InventoryFolderBase> allFolders = GetInventorySkeleton(userID);
if (null == allFolders)
{
invCollection.AllItems = allItems;
invCollection.Folders = folders;
invCollection.UserID = userID;
m_log.WarnFormat("[AGENT INVENTORY]: No inventory found for user {0}", rawUserID);
return invCollection;
}
List<InventoryItemBase> allItems = new List<InventoryItemBase>();
foreach (InventoryFolderBase folder in allFolders)
{
List<InventoryItemBase> items = RequestFolderItems(folder.ID);
if (items != null)
{
allItems.InsertRange(0, items);
}
}
invCollection.AllItems = allItems;
invCollection.Folders = allFolders;
invCollection.UserID = userID;
// foreach (InventoryFolderBase folder in folders)
// {
// m_log.DebugFormat(