diff options
author | Adam Frisby | 2008-04-21 07:16:30 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:16:30 +0000 |
commit | 01663cb6122a94c5a8ca7b8f4e578fab216b9488 (patch) | |
tree | 8e512ae348f5289327bccf1bf76e50d8cf7edadc /ThirdParty/3Di/RegionProxy | |
parent | * Optimised using statements and namespace references across entire project (... (diff) | |
download | opensim-SC_OLD-01663cb6122a94c5a8ca7b8f4e578fab216b9488.zip opensim-SC_OLD-01663cb6122a94c5a8ca7b8f4e578fab216b9488.tar.gz opensim-SC_OLD-01663cb6122a94c5a8ca7b8f4e578fab216b9488.tar.bz2 opensim-SC_OLD-01663cb6122a94c5a8ca7b8f4e578fab216b9488.tar.xz |
* Committing fix for previous build breakage. Sorry!
* Committing namespace/usings fixes for ThirdParty directory, missed in previous commit.
Diffstat (limited to 'ThirdParty/3Di/RegionProxy')
-rw-r--r-- | ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs | 24 |
1 files changed, 9 insertions, 15 deletions
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; |