Melanie 005c69511d Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs		2013-08-07 23:29:42 +01:00
..
Addons	Group notices bug fix: use a new IM for each member of the group, otherwise the fields get messed up because the transfer is async	2013-08-05 08:09:30 -07:00
ApplicationPlugins	Merge branch 'master' into careminster	2013-05-11 02:35:26 +01:00
Capabilities	Merge branch 'master' into careminster	2013-07-24 03:50:09 +01: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-07-29 02:08:05 +01:00
Framework	Merge branch 'master' into careminster	2013-08-07 23:29:42 +01:00
Region	Merge branch 'master' into careminster	2013-08-07 23:29:42 +01:00
Server	Merge branch 'master' into careminster	2013-07-18 10:08:10 +01:00
Services	Merge branch 'master' into careminster	2013-08-07 23:29:42 +01:00
Tests	Merge branch 'master' into careminster	2013-08-07 23:29:42 +01:00
Tools	Fixed incomplete commit r/23317 -- see_into_region. Put the guard around estate bans also, and delete the obsolete config var.	2013-08-07 08:01:59 -07:00