HG 2.0 Suitcase inventory: proof of concept now working properly with the heavy SendBulkInventoryUpdate message. Waiting for Melanie to finish the light-weight version of that message.

0.7.4.1
Diva Canto 2012-03-28 15:32:19 -07:00
parent 51dc1e709c
commit 6bf4d88397
1 changed files with 10 additions and 9 deletions

View File

@ -428,16 +428,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
if (core.TryGet<IClientInventory>(out inv)) if (core.TryGet<IClientInventory>(out inv))
{ {
InventoryFolderBase root = m_Scenes[0].InventoryService.GetRootFolder(client.AgentId); InventoryFolderBase root = m_Scenes[0].InventoryService.GetRootFolder(client.AgentId);
if (root != null) client.SendBulkUpdateInventory(root);
{ //if (root != null)
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Restoring root inventory for user {0}", client.AgentId); //{
InventoryCollection content = m_Scenes[0].InventoryService.GetFolderContent(client.AgentId, root.ID); // m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Restoring root inventory for user {0}", client.AgentId);
m_log.DebugFormat("[XXX]: Folder name {0}, id {1}, parent {2}", root.Name, root.ID, root.ParentID); // InventoryCollection content = m_Scenes[0].InventoryService.GetFolderContent(client.AgentId, root.ID);
foreach (InventoryItemBase i in content.Items) // m_log.DebugFormat("[XXX]: Folder name {0}, id {1}, parent {2}", root.Name, root.ID, root.ParentID);
m_log.DebugFormat("[XXX]: Name={0}, folderID={1}", i.Name, i.Folder); // foreach (InventoryItemBase i in content.Items)
// m_log.DebugFormat("[XXX]: Name={0}, folderID={1}", i.Name, i.Folder);
inv.SendBulkUpdateInventory(content.Folders.ToArray(), content.Items.ToArray()); // inv.SendBulkUpdateInventory(content.Folders.ToArray(), content.Items.ToArray());
} //}
} }
} }
} }