Melanie e8cd9fbbb7 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs		2012-06-07 23:33:40 +01:00
..
ApplicationPlugins	Merge branch 'avination' into careminster	2012-06-06 14:16:19 +01:00
Capabilities	Fix build break whree accidentally did inv.Folders rather than inv.Folders.Count in a minor change.	2012-06-02 05:03:56 +01: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 careminster	2012-05-27 19:24:30 +01:00
Framework	Merge branch 'master' into careminster	2012-06-07 23:33:40 +01:00
Region	Merge branch 'master' into careminster	2012-06-07 23:33:40 +01:00
Server	Merge branch 'master' into careminster	2012-05-27 19:24:30 +01:00
Services	Merge branch 'master' into careminster	2012-06-03 02:36:28 +01:00
Tests	Merge branch 'master' into careminster	2012-05-27 19:24:30 +01:00
Tools	Invoke log4net configurator in pCampBot.exe in order to get OpenSim sylte logging	2012-05-18 00:49:39 +01:00