Melanie 3f42183797 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs		2011-12-10 00:40:41 +00:00
..
ApplicationPlugins	Merge branch 'master' into bigmerge	2011-12-08 05:47:45 +00:00
Capabilities	Add commented log lines to FetchInventoryDescendents2 path for future use.	2011-12-09 22:32:28 +00:00
ConsoleClient	Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.	2011-10-25 20:24:21 +01:00
Data	Merge branch 'master' into bigmerge	2011-12-05 17:10:51 +00:00
Framework	Merge branch 'master' into careminster	2011-12-10 00:40:41 +00:00
Region	Merge branch 'master' into careminster	2011-12-10 00:40:41 +00:00
Server	Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.	2011-12-05 20:44:20 +00:00
Services	Merge branch 'master' into bigmerge	2011-12-05 17:10:51 +00:00
Tests	Merge branch 'master' into bigmerge	2011-12-08 18:29:19 +00:00
Tools	Adding missing CrossBehaviour.cs file to fix build	2011-11-24 22:46:43 +00:00