From c5de9840b05514eb659696239593e51e636398b8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 16 Apr 2013 21:58:24 +0100
Subject: 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.
---
OpenSim/Region/Application/OpenSimBase.cs | 2 +-
OpenSim/Region/ClientStack/IClientNetworkServer.cs | 15 +++++++++++++--
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 5 -----
3 files changed, 14 insertions(+), 8 deletions(-)
(limited to 'OpenSim/Region')
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
if (foundClientServer)
{
- m_clientServers[clientServerElement].NetworkStop();
+ m_clientServers[clientServerElement].Stop();
m_clientServers.RemoveAt(clientServerElement);
}
}
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
IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource,
AgentCircuitManager authenticateClass);
- void NetworkStop();
bool HandlesRegion(Location x);
- void AddScene(IScene x);
+ ///
+ /// Add the given scene to be handled by this IClientNetworkServer.
+ ///
+ ///
+ void AddScene(IScene scene);
+
+ ///
+ /// Start sending and receiving data.
+ ///
void Start();
+
+ ///
+ /// Stop sending and receiving data.
+ ///
void Stop();
}
}
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
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);
--
cgit v1.1