Melanie 985526b662 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs		2012-02-18 22:21:10 +00:00
..
ApplicationPlugins	Merge branch 'master' into careminster	2012-02-04 11:48:20 +00:00
Capabilities	Implement the FetchInventory2 capability. This accompanies the existing FetchInventoryDescendents2 capability.	2012-01-06 21:07:34 +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 careminster	2012-02-18 22:21:10 +00:00
Framework	Merge branch 'master' into careminster	2012-02-18 22:21:10 +00:00
Region	Merge branch 'master' into careminster	2012-02-18 22:21:10 +00:00
Server	Merge branch 'master' into careminster	2012-02-02 22:36:41 +00:00
Services	Merge branch 'master' into careminster	2012-02-18 22:21:10 +00:00
Tests	Merge branch 'master' into careminster	2012-02-16 00:38:04 +00:00
Tools	minor: add missing newlines to pCampbot usage statement	2012-01-03 15:42:36 +00:00