mirror of
https://github.com/opensim/opensim.git
synced 2026-05-15 19:35:41 +08:00
Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs