Melanie e2e839a0cd Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs		2013-05-24 01:11:49 +01:00
..
Addons	Groups: Improve error handling on remote connector.	2013-05-13 11:36:17 -07:00
ApplicationPlugins	Merge branch 'master' into careminster	2013-05-11 02:35:26 +01:00
Capabilities	Merge branch 'master' into careminster	2013-05-08 20:59:44 +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-05-11 02:35:26 +01:00
Framework	Merge branch 'master' into careminster	2013-05-24 00:45:08 +01:00
Region	Merge branch 'master' into careminster	2013-05-24 01:11:49 +01:00
Server	Merge branch 'master' into careminster	2013-05-16 21:59:14 +01:00
Services	Merge branch 'master' into careminster	2013-05-11 02:35:26 +01:00
Tests	Merge branch 'master' into careminster	2013-05-11 02:35:26 +01:00
Tools	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask	2013-03-26 03:40:06 +00:00