mirror of
https://github.com/opensim/opensim.git
synced 2026-05-16 11:46:04 +08:00
Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs