diff options
| author | Melanie | 2012-03-28 02:46:54 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-28 02:46:54 +0100 |
| commit | 300488f8621004c5927dd31ab85e0f796f9373bd (patch) | |
| tree | 098ba7f741d0404f0e6c2d46fa90e5ad21a36da2 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-300488f8621004c5927dd31ab85e0f796f9373bd.zip opensim-SC-300488f8621004c5927dd31ab85e0f796f9373bd.tar.gz opensim-SC-300488f8621004c5927dd31ab85e0f796f9373bd.tar.bz2 opensim-SC-300488f8621004c5927dd31ab85e0f796f9373bd.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Client/IClientInventory.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Client/IClientInventory.cs b/OpenSim/Framework/Client/IClientInventory.cs index d59f8b7..a6e0510 100644 --- a/OpenSim/Framework/Client/IClientInventory.cs +++ b/OpenSim/Framework/Client/IClientInventory.cs | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | using System; | 28 | using System; |
| 29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
| 30 | using OpenSim.Framework; | ||
| 30 | 31 | ||
| 31 | namespace OpenSim.Framework.Client | 32 | namespace OpenSim.Framework.Client |
| 32 | { | 33 | { |
| @@ -34,5 +35,6 @@ namespace OpenSim.Framework.Client | |||
| 34 | { | 35 | { |
| 35 | void SendRemoveInventoryFolders(UUID[] folders); | 36 | void SendRemoveInventoryFolders(UUID[] folders); |
| 36 | void SendRemoveInventoryItems(UUID[] folders); | 37 | void SendRemoveInventoryItems(UUID[] folders); |
| 38 | void SendBulkUpdateInventory(InventoryFolderBase[] folders, InventoryItemBase[] items); | ||
| 37 | } | 39 | } |
| 38 | } | 40 | } |