From 743e336bf340f623a50bebd53d98798c04eb0345 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 3 Oct 2008 18:06:45 +0000 Subject: * Put in some infrastructure to allow tweaking of packet queue throttle values for the total throttle (the one that throttles all packet output) * Not complete yet --- OpenSim/Region/ClientStack/ClientStackManager.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/ClientStack/ClientStackManager.cs') diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs index b5cd06a..0b0c07f 100644 --- a/OpenSim/Region/ClientStack/ClientStackManager.cs +++ b/OpenSim/Region/ClientStack/ClientStackManager.cs @@ -43,10 +43,11 @@ namespace OpenSim.Region.Environment private Type plugin; private Assembly pluginAssembly; - public ClientStackManager(string dllName) { + public ClientStackManager(string dllName) + { m_log.Info("[CLIENTSTACK]: Attempting to load " + dllName); - plugin=null; + plugin = null; pluginAssembly = Assembly.LoadFrom(dllName); foreach (Type pluginType in pluginAssembly.GetTypes()) @@ -65,16 +66,22 @@ namespace OpenSim.Region.Environment } } - public IClientNetworkServer CreateServer(IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, AssetCache assetCache, AgentCircuitManager authenticateClass) + public IClientNetworkServer CreateServer( + IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, ClientStackUserSettings settings, + AssetCache assetCache, AgentCircuitManager authenticateClass) { if (plugin != null) { IClientNetworkServer server = (IClientNetworkServer) Activator.CreateInstance(pluginAssembly.GetType(plugin.ToString())); - server.Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, assetCache, authenticateClass); + + server.Initialise( + _listenIP, ref port, proxyPortOffset, allow_alternate_port, settings, assetCache, authenticateClass); + return server; } - m_log.Error("[CLIENTSTACK] Couldn't initialize a new server"); + + m_log.Error("[CLIENTSTACK]: Couldn't initialize a new server"); return null; } } -- cgit v1.1