aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-04-21 07:16:30 +0000
committerAdam Frisby2008-04-21 07:16:30 +0000
commit01663cb6122a94c5a8ca7b8f4e578fab216b9488 (patch)
tree8e512ae348f5289327bccf1bf76e50d8cf7edadc
parent* Optimised using statements and namespace references across entire project (... (diff)
downloadopensim-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.
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs4
-rw-r--r--ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs30
-rw-r--r--ThirdParty/3Di/LoadBalancer/TcpClient.cs3
-rw-r--r--ThirdParty/3Di/LoadBalancer/TcpServer.cs4
-rw-r--r--ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs24
5 files changed, 21 insertions, 44 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index 8aee94e..5d33294 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -32,8 +32,8 @@ using OpenSim.Region.Environment.Interfaces;
32using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; 32using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
33using integer = System.Int32; 33using integer = System.Int32;
34using key = System.String; 34using key = System.String;
35using vector = ScriptEngine.Common.LSL_Types.Vector3; 35using vector = OpenSim.Region.ScriptEngine.Common.LSL_Types.Vector3;
36using rotation = Quaternion; 36using rotation = OpenSim.Region.ScriptEngine.Common.LSL_Types.Quaternion;
37 37
38namespace OpenSim.Region.ScriptEngine.Common 38namespace OpenSim.Region.ScriptEngine.Common
39{ 39{
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
28using System; 28using System;
29using System.IO;
30using System.Net;
31using System.Xml;
32using System.Text;
33using System.Xml.Serialization;
34using System.Net.Sockets;
35using System.Collections; 29using System.Collections;
36using System.Collections.Generic; 30using System.Collections.Generic;
37using System.Diagnostics; 31using System.IO;
32using System.Net;
33using System.Reflection;
38using System.Threading; 34using System.Threading;
39 35using libsecondlife;
36using libsecondlife.Packets;
37using log4net;
38using Mono.Addins;
39using Nwc.XmlRpc;
40using OpenSim.Framework; 40using OpenSim.Framework;
41using OpenSim.Framework.Console;
42using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
43using OpenSim.Region.Environment;
44using OpenSim.Region.Environment.Scenes;
45using OpenSim.Region.ClientStack; 42using OpenSim.Region.ClientStack;
46 43using OpenSim.Region.Environment.Scenes;
47using Nwc.XmlRpc;
48using Nini.Config;
49
50using Mono.Addins;
51
52using libsecondlife;
53using 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
28using System; 28using System;
29using System.IO;
30using System.Net; 29using System.Net;
31using System.Net.Sockets; 30using System.Net.Sockets;
32using System.Threading; 31using System.Threading;
33using System.Text;
34using System.Runtime.Serialization.Formatters.Binary;
35 32
36namespace OpenSim.ApplicationPlugins.LoadBalancer { 33namespace 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;
29using System.IO; 29using System.IO;
30using System.Net; 30using System.Net;
31using System.Net.Sockets; 31using System.Net.Sockets;
32using System.Text;
33using System.Threading; 32using System.Threading;
34using System.Runtime.Serialization.Formatters.Binary;
35
36using OpenSim.Framework.Console;
37 33
38namespace OpenSim.ApplicationPlugins.LoadBalancer { 34namespace 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
28using System; 28using System;
29using System.IO;
30using System.Net;
31using System.Xml;
32using System.Text;
33using System.Xml.Serialization;
34using System.Net.Sockets;
35using System.Collections; 29using System.Collections;
36using System.Collections.Generic; 30using System.Collections.Generic;
37using System.Diagnostics; 31using System.Net;
38 32using System.Net.Sockets;
33using System.Reflection;
34using log4net;
35using Mono.Addins;
36using Nwc.XmlRpc;
39using OpenSim.Framework; 37using OpenSim.Framework;
40using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
41using OpenSim.Framework.Console;
42using Nwc.XmlRpc;
43
44using 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;