* Committing fix for previous build breakage. Sorry!

* Committing namespace/usings fixes for ThirdParty directory, missed in previous commit.

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;
 using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
 using integer = System.Int32;
 using key = System.String;
-using vector = ScriptEngine.Common.LSL_Types.Vector3;
-using rotation = Quaternion;
+using vector = OpenSim.Region.ScriptEngine.Common.LSL_Types.Vector3;
+using rotation = OpenSim.Region.ScriptEngine.Common.LSL_Types.Quaternion;
 
 namespace OpenSim.Region.ScriptEngine.Common
 {
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 @@
  */
 
 using System;
-using System.IO;
-using System.Net;
-using System.Xml;
-using System.Text;
-using System.Xml.Serialization;
-using System.Net.Sockets;
 using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
+using System.IO;
+using System.Net;
+using System.Reflection;
 using System.Threading;
-
+using libsecondlife;
+using libsecondlife.Packets;
+using log4net;
+using Mono.Addins;
+using Nwc.XmlRpc;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.ClientStack;
-
-using Nwc.XmlRpc;
-using Nini.Config;
-
-using Mono.Addins;
-
-using libsecondlife;
-using libsecondlife.Packets;
+using OpenSim.Region.Environment.Scenes;
 
 [assembly:Addin]
 [assembly:AddinDependency ("OpenSim", "0.5")]
@@ -61,7 +51,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
     [Extension("/OpenSim/Startup")]
     public class LoadBalancerPlugin : IApplicationPlugin
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private OpenSimMain simMain;
         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 @@
  */
 
 using System;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
-using System.Text;
-using System.Runtime.Serialization.Formatters.Binary;
 
 namespace OpenSim.ApplicationPlugins.LoadBalancer {
     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;
 using System.IO;
 using System.Net;
 using System.Net.Sockets;
-using System.Text;
 using System.Threading;
-using System.Runtime.Serialization.Formatters.Binary;
-
-using OpenSim.Framework.Console;
 
 namespace OpenSim.ApplicationPlugins.LoadBalancer {
 
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 @@
  */
 
 using System;
-using System.IO;
-using System.Net;
-using System.Xml;
-using System.Text;
-using System.Xml.Serialization;
-using System.Net.Sockets;
 using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
-
+using System.Net;
+using System.Net.Sockets;
+using System.Reflection;
+using log4net;
+using Mono.Addins;
+using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Console;
-using Nwc.XmlRpc;
-
-using Mono.Addins;
 
 [assembly:Addin ("RegionProxy", "0.1")]
 [assembly:AddinDependency ("OpenSim", "0.5")]
@@ -71,7 +65,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
     {
         private ProxyServer proxy;
         private BaseHttpServer command_server;
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public void Initialise(OpenSimMain openSim)
         {
@@ -199,7 +193,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
     public class ProxyServer {
         protected AsyncCallback receivedData;
         protected ProxyMap proxy_map = new ProxyMap();
-        protected readonly log4net.ILog m_log;
+        protected readonly ILog m_log;
         protected bool running;
 
         protected class ProxyMap
@@ -279,7 +273,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
             }
         }
 
-        public ProxyServer(log4net.ILog log)
+        public ProxyServer(ILog log)
         {
             m_log = log;
             running=false;