diff options
author | Justin Clark-Casey (justincc) | 2013-04-16 21:58:24 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-04-16 21:58:24 +0100 |
commit | c5de9840b05514eb659696239593e51e636398b8 (patch) | |
tree | b0f785416fb46b0a7f83cbb4c8ee9cea549102a1 /OpenSim/Region | |
parent | BulletSim: fixing problems with llMoveToTarget. Not all fixed yet. (diff) | |
download | opensim-SC-c5de9840b05514eb659696239593e51e636398b8.zip opensim-SC-c5de9840b05514eb659696239593e51e636398b8.tar.gz opensim-SC-c5de9840b05514eb659696239593e51e636398b8.tar.bz2 opensim-SC-c5de9840b05514eb659696239593e51e636398b8.tar.xz |
refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing Stop().
This was an undocumented interface which I think was for long defunct region load balancing experiments.
Also adds method doc for some IClientNetworkServer methods.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/IClientNetworkServer.cs | 15 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 5 |
3 files changed, 14 insertions, 8 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index c555915..d86eefe 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -737,7 +737,7 @@ namespace OpenSim | |||
737 | 737 | ||
738 | if (foundClientServer) | 738 | if (foundClientServer) |
739 | { | 739 | { |
740 | m_clientServers[clientServerElement].NetworkStop(); | 740 | m_clientServers[clientServerElement].Stop(); |
741 | m_clientServers.RemoveAt(clientServerElement); | 741 | m_clientServers.RemoveAt(clientServerElement); |
742 | } | 742 | } |
743 | } | 743 | } |
diff --git a/OpenSim/Region/ClientStack/IClientNetworkServer.cs b/OpenSim/Region/ClientStack/IClientNetworkServer.cs index 54a441b..bb7e6d0 100644 --- a/OpenSim/Region/ClientStack/IClientNetworkServer.cs +++ b/OpenSim/Region/ClientStack/IClientNetworkServer.cs | |||
@@ -38,11 +38,22 @@ namespace OpenSim.Region.ClientStack | |||
38 | IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, | 38 | IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, |
39 | AgentCircuitManager authenticateClass); | 39 | AgentCircuitManager authenticateClass); |
40 | 40 | ||
41 | void NetworkStop(); | ||
42 | bool HandlesRegion(Location x); | 41 | bool HandlesRegion(Location x); |
43 | void AddScene(IScene x); | ||
44 | 42 | ||
43 | /// <summary> | ||
44 | /// Add the given scene to be handled by this IClientNetworkServer. | ||
45 | /// </summary> | ||
46 | /// <param name='scene'></param> | ||
47 | void AddScene(IScene scene); | ||
48 | |||
49 | /// <summary> | ||
50 | /// Start sending and receiving data. | ||
51 | /// </summary> | ||
45 | void Start(); | 52 | void Start(); |
53 | |||
54 | /// <summary> | ||
55 | /// Stop sending and receiving data. | ||
56 | /// </summary> | ||
46 | void Stop(); | 57 | void Stop(); |
47 | } | 58 | } |
48 | } | 59 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 72516cd..985aa4d 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); |