diff options
| author | Diva Canto | 2012-03-27 20:38:02 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-03-27 20:38:02 -0700 |
| commit | 03766c010fe297e5459fbe8685ceed28f173634b (patch) | |
| tree | 5deee29e5061a603c61f4c707868d164e1ebb09e /OpenSim/Framework | |
| parent | More on switching the root folder from under the viewer. More experiments. (diff) | |
| parent | Typo fix (diff) | |
| download | opensim-SC-03766c010fe297e5459fbe8685ceed28f173634b.zip opensim-SC-03766c010fe297e5459fbe8685ceed28f173634b.tar.gz opensim-SC-03766c010fe297e5459fbe8685ceed28f173634b.tar.bz2 opensim-SC-03766c010fe297e5459fbe8685ceed28f173634b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -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 | } |