Melanie 05810e48b0 Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster ... Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs		2013-03-29 02:15:47 +00:00
..
Addons	Switched to using the other Util function with a default value.	2013-02-27 20:59:16 -08:00
ApplicationPlugins	Merge branch 'master' into careminster	2013-03-27 01:17:59 +00:00
Capabilities	Merge branch 'avination' into careminster	2013-03-03 13:24:37 +00:00
ConsoleClient	Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already.	2013-02-27 00:21:02 +00:00
Data	Merge branch 'master' into careminster	2013-03-15 23:45:32 +00:00
Framework	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask	2013-03-26 03:40:06 +00:00
Region	Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster	2013-03-29 02:15:47 +00:00
Server	Merge branch 'master' into careminster	2013-03-15 23:45:32 +00:00
Services	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask	2013-03-26 03:40:06 +00:00
Tests	Merge branch 'master' into careminster	2013-03-22 01:01:24 +00:00
Tools	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask	2013-03-26 03:40:06 +00:00