mirror of
git://opensimulator.org/git/opensim
synced 2026-08-15 01:22:15 +00:00
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/Physics/OdePlugin/OdePlugin.cs