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
..
Minimodule	Move simulator asset info commands to an optional module from the connector. Make them conform with service side commands.	2012-01-05 20:51:49 +00:00
ObjectModules	Add copyright headers.	2009-03-07 02:11:50 +00:00
RegionReadyModule	Remove some debugging output form the logger	2012-02-16 08:59:34 -05:00
ScriptModuleComms	Revert "Updates all IRegionModules to the new style region modules."	2010-01-29 07:20:13 +00:00
XmlRpcRouterModule	Resolve merge commits, stage 1	2011-09-04 07:06:36 -07:00