mirror of
https://github.com/opensim/opensim.git
synced 2026-05-24 02:35:36 +08:00
Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs