mirror of
https://github.com/opensim/opensim.git
synced 2026-07-04 01:40:07 +08:00
Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs