diff options
Diffstat (limited to 'ThirdParty/3Di')
-rw-r--r-- | ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs | 30 | ||||
-rw-r--r-- | ThirdParty/3Di/LoadBalancer/TcpClient.cs | 3 | ||||
-rw-r--r-- | ThirdParty/3Di/LoadBalancer/TcpServer.cs | 4 | ||||
-rw-r--r-- | ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs | 24 |
4 files changed, 19 insertions, 42 deletions
diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs index b552d62..532720d 100644 --- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs +++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs | |||
@@ -26,31 +26,21 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Net; | ||
31 | using System.Xml; | ||
32 | using System.Text; | ||
33 | using System.Xml.Serialization; | ||
34 | using System.Net.Sockets; | ||
35 | using System.Collections; | 29 | using System.Collections; |
36 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
37 | using System.Diagnostics; | 31 | using System.IO; |
32 | using System.Net; | ||
33 | using System.Reflection; | ||
38 | using System.Threading; | 34 | using System.Threading; |
39 | 35 | using libsecondlife; | |
36 | using libsecondlife.Packets; | ||
37 | using log4net; | ||
38 | using Mono.Addins; | ||
39 | using Nwc.XmlRpc; | ||
40 | using OpenSim.Framework; | 40 | using OpenSim.Framework; |
41 | using OpenSim.Framework.Console; | ||
42 | using OpenSim.Framework.Servers; | 41 | using OpenSim.Framework.Servers; |
43 | using OpenSim.Region.Environment; | ||
44 | using OpenSim.Region.Environment.Scenes; | ||
45 | using OpenSim.Region.ClientStack; | 42 | using OpenSim.Region.ClientStack; |
46 | 43 | using OpenSim.Region.Environment.Scenes; | |
47 | using Nwc.XmlRpc; | ||
48 | using Nini.Config; | ||
49 | |||
50 | using Mono.Addins; | ||
51 | |||
52 | using libsecondlife; | ||
53 | using libsecondlife.Packets; | ||
54 | 44 | ||
55 | [assembly:Addin] | 45 | [assembly:Addin] |
56 | [assembly:AddinDependency ("OpenSim", "0.5")] | 46 | [assembly:AddinDependency ("OpenSim", "0.5")] |
@@ -61,7 +51,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer | |||
61 | [Extension("/OpenSim/Startup")] | 51 | [Extension("/OpenSim/Startup")] |
62 | public class LoadBalancerPlugin : IApplicationPlugin | 52 | public class LoadBalancerPlugin : IApplicationPlugin |
63 | { | 53 | { |
64 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
65 | 55 | ||
66 | private OpenSimMain simMain; | 56 | private OpenSimMain simMain; |
67 | private BaseHttpServer commandServer; | 57 | private BaseHttpServer commandServer; |
diff --git a/ThirdParty/3Di/LoadBalancer/TcpClient.cs b/ThirdParty/3Di/LoadBalancer/TcpClient.cs index ab1f692..7b5bc79 100644 --- a/ThirdParty/3Di/LoadBalancer/TcpClient.cs +++ b/ThirdParty/3Di/LoadBalancer/TcpClient.cs | |||
@@ -26,12 +26,9 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Net; | 29 | using System.Net; |
31 | using System.Net.Sockets; | 30 | using System.Net.Sockets; |
32 | using System.Threading; | 31 | using System.Threading; |
33 | using System.Text; | ||
34 | using System.Runtime.Serialization.Formatters.Binary; | ||
35 | 32 | ||
36 | namespace OpenSim.ApplicationPlugins.LoadBalancer { | 33 | namespace OpenSim.ApplicationPlugins.LoadBalancer { |
37 | public class AsynchronousClient { | 34 | public class AsynchronousClient { |
diff --git a/ThirdParty/3Di/LoadBalancer/TcpServer.cs b/ThirdParty/3Di/LoadBalancer/TcpServer.cs index 216db3b..6d45304 100644 --- a/ThirdParty/3Di/LoadBalancer/TcpServer.cs +++ b/ThirdParty/3Di/LoadBalancer/TcpServer.cs | |||
@@ -29,11 +29,7 @@ using System; | |||
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Net; | 30 | using System.Net; |
31 | using System.Net.Sockets; | 31 | using System.Net.Sockets; |
32 | using System.Text; | ||
33 | using System.Threading; | 32 | using System.Threading; |
34 | using System.Runtime.Serialization.Formatters.Binary; | ||
35 | |||
36 | using OpenSim.Framework.Console; | ||
37 | 33 | ||
38 | namespace OpenSim.ApplicationPlugins.LoadBalancer { | 34 | namespace OpenSim.ApplicationPlugins.LoadBalancer { |
39 | 35 | ||
diff --git a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs index 5ab7eae..162b34d 100644 --- a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs +++ b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs | |||
@@ -26,22 +26,16 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Net; | ||
31 | using System.Xml; | ||
32 | using System.Text; | ||
33 | using System.Xml.Serialization; | ||
34 | using System.Net.Sockets; | ||
35 | using System.Collections; | 29 | using System.Collections; |
36 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
37 | using System.Diagnostics; | 31 | using System.Net; |
38 | 32 | using System.Net.Sockets; | |
33 | using System.Reflection; | ||
34 | using log4net; | ||
35 | using Mono.Addins; | ||
36 | using Nwc.XmlRpc; | ||
39 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Servers; | 38 | using OpenSim.Framework.Servers; |
41 | using OpenSim.Framework.Console; | ||
42 | using Nwc.XmlRpc; | ||
43 | |||
44 | using Mono.Addins; | ||
45 | 39 | ||
46 | [assembly:Addin ("RegionProxy", "0.1")] | 40 | [assembly:Addin ("RegionProxy", "0.1")] |
47 | [assembly:AddinDependency ("OpenSim", "0.5")] | 41 | [assembly:AddinDependency ("OpenSim", "0.5")] |
@@ -71,7 +65,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy | |||
71 | { | 65 | { |
72 | private ProxyServer proxy; | 66 | private ProxyServer proxy; |
73 | private BaseHttpServer command_server; | 67 | private BaseHttpServer command_server; |
74 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 68 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
75 | 69 | ||
76 | public void Initialise(OpenSimMain openSim) | 70 | public void Initialise(OpenSimMain openSim) |
77 | { | 71 | { |
@@ -199,7 +193,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy | |||
199 | public class ProxyServer { | 193 | public class ProxyServer { |
200 | protected AsyncCallback receivedData; | 194 | protected AsyncCallback receivedData; |
201 | protected ProxyMap proxy_map = new ProxyMap(); | 195 | protected ProxyMap proxy_map = new ProxyMap(); |
202 | protected readonly log4net.ILog m_log; | 196 | protected readonly ILog m_log; |
203 | protected bool running; | 197 | protected bool running; |
204 | 198 | ||
205 | protected class ProxyMap | 199 | protected class ProxyMap |
@@ -279,7 +273,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy | |||
279 | } | 273 | } |
280 | } | 274 | } |
281 | 275 | ||
282 | public ProxyServer(log4net.ILog log) | 276 | public ProxyServer(ILog log) |
283 | { | 277 | { |
284 | m_log = log; | 278 | m_log = log; |
285 | running=false; | 279 | running=false; |