aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorMelanie2013-04-16 22:37:47 +0100
committerMelanie2013-04-16 22:37:47 +0100
commitd3f288e27b6298af557da7061be148c4d27b0651 (patch)
treeec11033f03830dd7a1a842e1064e981a7966cadd /OpenSim/Region/ClientStack/Linden
parentMerge branch 'master' into careminster (diff)
parentrefactor: Remove IClientNetworkServer.NetworkStop() in favour of existing Sto... (diff)
downloadopensim-SC-d3f288e27b6298af557da7061be148c4d27b0651.zip
opensim-SC-d3f288e27b6298af557da7061be148c4d27b0651.tar.gz
opensim-SC-d3f288e27b6298af557da7061be148c4d27b0651.tar.bz2
opensim-SC-d3f288e27b6298af557da7061be148c4d27b0651.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs5
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index e07ce4c..33ca08c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -62,11 +62,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
62 m_udpServer = new LLUDPServer(listenIP, ref port, proxyPortOffsetParm, allow_alternate_port, configSource, circuitManager); 62 m_udpServer = new LLUDPServer(listenIP, ref port, proxyPortOffsetParm, allow_alternate_port, configSource, circuitManager);
63 } 63 }
64 64
65 public void NetworkStop()
66 {
67 m_udpServer.Stop();
68 }
69
70 public void AddScene(IScene scene) 65 public void AddScene(IScene scene)
71 { 66 {
72 m_udpServer.AddScene(scene); 67 m_udpServer.AddScene(scene);