diff options
| author | Melanie | 2012-03-28 02:20:40 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-28 02:20:40 +0100 |
| commit | b519cf63830f6248440525516eb7f70eba86abf3 (patch) | |
| tree | 085ad7245d7dbdb59113d8e5b0822529703d0916 /OpenSim/Framework/Client | |
| parent | Add SendRemoveInventoryFolders which allows to remove one or more (diff) | |
| parent | Add a corresponding method for items. HG v2 (diff) | |
| download | opensim-SC-b519cf63830f6248440525516eb7f70eba86abf3.zip opensim-SC-b519cf63830f6248440525516eb7f70eba86abf3.tar.gz opensim-SC-b519cf63830f6248440525516eb7f70eba86abf3.tar.bz2 opensim-SC-b519cf63830f6248440525516eb7f70eba86abf3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Client/IClientInventory.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Client/IClientInventory.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/Client/IClientInventory.cs b/OpenSim/Framework/Client/IClientInventory.cs index 00651e0..d59f8b7 100644 --- a/OpenSim/Framework/Client/IClientInventory.cs +++ b/OpenSim/Framework/Client/IClientInventory.cs | |||
| @@ -33,5 +33,6 @@ namespace OpenSim.Framework.Client | |||
| 33 | public interface IClientInventory | 33 | public interface IClientInventory |
| 34 | { | 34 | { |
| 35 | void SendRemoveInventoryFolders(UUID[] folders); | 35 | void SendRemoveInventoryFolders(UUID[] folders); |
| 36 | void SendRemoveInventoryItems(UUID[] folders); | ||
| 36 | } | 37 | } |
| 37 | } | 38 | } |