mirror of
https://github.com/opensim/opensim.git
synced 2026-05-16 19:56:04 +08:00
Conflicts: OpenSim/Framework/Constants.cs OpenSim/Framework/RegionInfo.cs OpenSim/Services/GridService/GridService.cs OpenSim/Services/Interfaces/IGridService.cs Most conflicts had to do with Util routines not in master branch yet.