Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs