Merge branch 'master' into careminster

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 @@
 
 using System;
 using OpenMetaverse;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Client
 {
@@ -34,5 +35,6 @@ namespace OpenSim.Framework.Client
     {
         void SendRemoveInventoryFolders(UUID[] folders);
         void SendRemoveInventoryItems(UUID[] folders);
+        void SendBulkUpdateInventory(InventoryFolderBase[] folders, InventoryItemBase[] items);
     }
 }