Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-04-16 22:37:47 +01:00
3 changed files with 14 additions and 8 deletions

View File

@@ -62,11 +62,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_udpServer = new LLUDPServer(listenIP, ref port, proxyPortOffsetParm, allow_alternate_port, configSource, circuitManager);
}
public void NetworkStop()
{
m_udpServer.Stop();
}
public void AddScene(IScene scene)
{
m_udpServer.AddScene(scene);