diff options
| author | Diva Canto | 2012-03-28 15:32:19 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-03-28 15:32:19 -0700 |
| commit | 6bf4d88397bb95cf7d8f304604481838edf75280 (patch) | |
| tree | dbb9d026bbe0af1e418e6d66fb312a86d900955b /OpenSim/Region | |
| parent | HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the hac... (diff) | |
| download | opensim-SC-6bf4d88397bb95cf7d8f304604481838edf75280.zip opensim-SC-6bf4d88397bb95cf7d8f304604481838edf75280.tar.gz opensim-SC-6bf4d88397bb95cf7d8f304604481838edf75280.tar.bz2 opensim-SC-6bf4d88397bb95cf7d8f304604481838edf75280.tar.xz | |
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.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index e8d821f..ec260b4 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
| @@ -428,16 +428,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 428 | if (core.TryGet<IClientInventory>(out inv)) | 428 | if (core.TryGet<IClientInventory>(out inv)) |
| 429 | { | 429 | { |
| 430 | InventoryFolderBase root = m_Scenes[0].InventoryService.GetRootFolder(client.AgentId); | 430 | InventoryFolderBase root = m_Scenes[0].InventoryService.GetRootFolder(client.AgentId); |
| 431 | if (root != null) | 431 | client.SendBulkUpdateInventory(root); |
| 432 | { | 432 | //if (root != null) |
| 433 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Restoring root inventory for user {0}", client.AgentId); | 433 | //{ |
| 434 | InventoryCollection content = m_Scenes[0].InventoryService.GetFolderContent(client.AgentId, root.ID); | 434 | // m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Restoring root inventory for user {0}", client.AgentId); |
| 435 | m_log.DebugFormat("[XXX]: Folder name {0}, id {1}, parent {2}", root.Name, root.ID, root.ParentID); | 435 | // InventoryCollection content = m_Scenes[0].InventoryService.GetFolderContent(client.AgentId, root.ID); |
| 436 | foreach (InventoryItemBase i in content.Items) | 436 | // m_log.DebugFormat("[XXX]: Folder name {0}, id {1}, parent {2}", root.Name, root.ID, root.ParentID); |
| 437 | m_log.DebugFormat("[XXX]: Name={0}, folderID={1}", i.Name, i.Folder); | 437 | // foreach (InventoryItemBase i in content.Items) |
| 438 | 438 | // m_log.DebugFormat("[XXX]: Name={0}, folderID={1}", i.Name, i.Folder); | |
| 439 | inv.SendBulkUpdateInventory(content.Folders.ToArray(), content.Items.ToArray()); | 439 | |
| 440 | } | 440 | // inv.SendBulkUpdateInventory(content.Folders.ToArray(), content.Items.ToArray()); |
| 441 | //} | ||
| 441 | } | 442 | } |
| 442 | } | 443 | } |
| 443 | } | 444 | } |