diff options
| author | Melanie Thielker | 2009-03-23 02:02:12 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2009-03-23 02:02:12 +0000 |
| commit | e1ea3f05aa9de2ccb11b86365b5e4063e8ab05b3 (patch) | |
| tree | d2e821a276474c296ddcd674b05b17a38726b650 | |
| parent | Committing partial work on passing folders across instances. This may crash. (diff) | |
| download | opensim-SC-e1ea3f05aa9de2ccb11b86365b5e4063e8ab05b3.zip opensim-SC-e1ea3f05aa9de2ccb11b86365b5e4063e8ab05b3.tar.gz opensim-SC-e1ea3f05aa9de2ccb11b86365b5e4063e8ab05b3.tar.bz2 opensim-SC-e1ea3f05aa9de2ccb11b86365b5e4063e8ab05b3.tar.xz | |
Finish folder gives. With this commit, single item and folder gives now
work across regions and also to offline avatars. Scripted gives are not
yet tested and may not work.
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 19b9b22..2939282 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
| @@ -451,6 +451,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
| 451 | 451 | ||
| 452 | user.ControllingClient.SendBulkUpdateInventory(folderInfo); | 452 | user.ControllingClient.SendBulkUpdateInventory(folderInfo); |
| 453 | 453 | ||
| 454 | // This unelegant, slow kludge is to reload the folders and | ||
| 455 | // items. Since a folder give can transfer subfolders and | ||
| 456 | // items, this is the easiest way to pull that stuff in | ||
| 457 | // | ||
| 458 | userInfo.DropInventory(); | ||
| 459 | userInfo.FetchInventory(); | ||
| 460 | |||
| 454 | // Deliver message | 461 | // Deliver message |
| 455 | // | 462 | // |
| 456 | user.ControllingClient.SendInstantMessage( | 463 | user.ControllingClient.SendInstantMessage( |