Melanie ae833af3a9 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs		2013-03-31 20:56:13 +01:00
..
Addons	…
ApplicationPlugins	…
Capabilities	…
ConsoleClient	…
Data	…
Framework	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask	2013-03-24 18:56:28 +01:00
Region	…
Server	…
Services	…
Tests	…
Tools	…