opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

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 /bin/OpenSim.Framework.Serialization.Tests.dll.config
parent	Add SendRemoveInventoryFolders which allows to remove one or more (diff)
parent	Add a corresponding method for items. HG v2 (diff)
download	opensim-SC_OLD-b519cf63830f6248440525516eb7f70eba86abf3.zip opensim-SC_OLD-b519cf63830f6248440525516eb7f70eba86abf3.tar.gz opensim-SC_OLD-b519cf63830f6248440525516eb7f70eba86abf3.tar.bz2 opensim-SC_OLD-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 'bin/OpenSim.Framework.Serialization.Tests.dll.config')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: