From fef3b3689492dea63693c964bcdbec9f5137eb5e Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Mon, 21 Apr 2008 07:09:17 +0000 Subject: * Optimised using statements and namespace references across entire project (this took a while to run). --- OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs | 13 ++++++------- OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs | 7 ++++--- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/RemoteServer') diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs b/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs index 2a2f24f..603808e 100644 --- a/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs +++ b/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs @@ -26,8 +26,7 @@ */ using System; -using System.Collections.Generic; -using System.Text; +using System.Net.Sockets; using System.Runtime.Remoting; using System.Runtime.Remoting.Channels; using System.Runtime.Remoting.Channels.Tcp; @@ -61,20 +60,20 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer // Use the object if (obj.Equals(null)) { - System.Console.WriteLine("Error: unable to locate server"); + Console.WriteLine("Error: unable to locate server"); } else { return obj; } } - catch (System.Net.Sockets.SocketException) + catch (SocketException) { - System.Console.WriteLine("Error: unable to connect to server"); + Console.WriteLine("Error: unable to connect to server"); } - catch (System.Runtime.Remoting.RemotingException) + catch (RemotingException) { - System.Console.WriteLine("Error: unable to connect to server"); + Console.WriteLine("Error: unable to connect to server"); } return null; } diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs index 0995afb..c33cfd1 100644 --- a/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs @@ -28,8 +28,9 @@ /* Original code: Tedd Hansen */ using System; +using System.Reflection; +using log4net; using Nini.Config; -using OpenSim.Framework.Console; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; @@ -42,7 +43,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer [Serializable] public class ScriptEngine : IRegionModule { - 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); internal Scene World; internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim @@ -53,7 +54,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer Common.mySE = this; } - public log4net.ILog Log + public ILog Log { get { return m_log; } } -- cgit v1.1