Conflicts: OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs