* Reduce publicly exposed fields on InventoryCollection, which was causing duplicate sets of inventory data to be sent over the grid

* Won't actually fix anything, since we were handling the problem anyway
* Also add more doc, fix up debugging messages, etc
This commit is contained in:
Justin Clarke Casey
2008-04-11 20:37:26 +00:00
parent 8f345d36d8
commit b3f783ae05
4 changed files with 48 additions and 77 deletions

View File

@@ -94,7 +94,7 @@ namespace OpenSim.Region.Communications.OGS1
{
m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " +
"Received inventory response for user {0} containing {1} folders and {2} items",
userID, response.Folders.Count, response.AllItems.Count);
userID, response.Folders.Count, response.Items.Count);
InventoryFolderImpl rootFolder = null;
InventoryRequest request = m_RequestingInventory[userID];
@@ -108,6 +108,8 @@ namespace OpenSim.Region.Communications.OGS1
{
rootFolder = new InventoryFolderImpl(folder);
folders.Add(rootFolder);
break;
}
}
@@ -121,11 +123,15 @@ namespace OpenSim.Region.Communications.OGS1
}
}
foreach (InventoryItemBase item in response.AllItems)
foreach (InventoryItemBase item in response.Items)
{
items.Add(item);
}
}
else
{
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Did not get back an inventory containing a root folder for user {0}", userID);
}
request.Callback(userID, folders, items);