ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Framework/Client/IClientInventory.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
This commit is contained in:
Melanie
2012-03-28 02:20:40 +01:00
parent 2a8b9a47b2 8c0f1e9058
commit b519cf6383
4 changed files with 73 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/Client/IClientInventory.cs
View File

@@ -33,5 +33,6 @@ namespace OpenSim.Framework.Client
public interface IClientInventory
{
void SendRemoveInventoryFolders(UUID[] folders);
void SendRemoveInventoryItems(UUID[] folders);
}
}