mirror of
git://opensimulator.org/git/opensim
synced 2026-08-16 01:52:15 +00:00
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