aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/ClientStackManager.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-03 18:06:45 +0000
committerJustin Clarke Casey2008-10-03 18:06:45 +0000
commit743e336bf340f623a50bebd53d98798c04eb0345 (patch)
treed6a0055ff71d99e7c0e132bb7ae51d0922949e0c /OpenSim/Region/ClientStack/ClientStackManager.cs
parentCause objects to be removed from the database when they go temp or get (diff)
downloadopensim-SC_OLD-743e336bf340f623a50bebd53d98798c04eb0345.zip
opensim-SC_OLD-743e336bf340f623a50bebd53d98798c04eb0345.tar.gz
opensim-SC_OLD-743e336bf340f623a50bebd53d98798c04eb0345.tar.bz2
opensim-SC_OLD-743e336bf340f623a50bebd53d98798c04eb0345.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientStackManager.cs')
-rw-r--r--OpenSim/Region/ClientStack/ClientStackManager.cs17
1 files changed, 12 insertions, 5 deletions
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
43 private Type plugin; 43 private Type plugin;
44 private Assembly pluginAssembly; 44 private Assembly pluginAssembly;
45 45
46 public ClientStackManager(string dllName) { 46 public ClientStackManager(string dllName)
47 {
47 m_log.Info("[CLIENTSTACK]: Attempting to load " + dllName); 48 m_log.Info("[CLIENTSTACK]: Attempting to load " + dllName);
48 49
49 plugin=null; 50 plugin = null;
50 pluginAssembly = Assembly.LoadFrom(dllName); 51 pluginAssembly = Assembly.LoadFrom(dllName);
51 52
52 foreach (Type pluginType in pluginAssembly.GetTypes()) 53 foreach (Type pluginType in pluginAssembly.GetTypes())
@@ -65,16 +66,22 @@ namespace OpenSim.Region.Environment
65 } 66 }
66 } 67 }
67 68
68 public IClientNetworkServer CreateServer(IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, AssetCache assetCache, AgentCircuitManager authenticateClass) 69 public IClientNetworkServer CreateServer(
70 IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, ClientStackUserSettings settings,
71 AssetCache assetCache, AgentCircuitManager authenticateClass)
69 { 72 {
70 if (plugin != null) 73 if (plugin != null)
71 { 74 {
72 IClientNetworkServer server = 75 IClientNetworkServer server =
73 (IClientNetworkServer) Activator.CreateInstance(pluginAssembly.GetType(plugin.ToString())); 76 (IClientNetworkServer) Activator.CreateInstance(pluginAssembly.GetType(plugin.ToString()));
74 server.Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, assetCache, authenticateClass); 77
78 server.Initialise(
79 _listenIP, ref port, proxyPortOffset, allow_alternate_port, settings, assetCache, authenticateClass);
80
75 return server; 81 return server;
76 } 82 }
77 m_log.Error("[CLIENTSTACK] Couldn't initialize a new server"); 83
84 m_log.Error("[CLIENTSTACK]: Couldn't initialize a new server");
78 return null; 85 return null;
79 } 86 }
80 } 87 }