diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/RemoteServer')
-rw-r--r-- | OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs | 7 |
2 files changed, 10 insertions, 10 deletions
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 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Net.Sockets; |
30 | using System.Text; | ||
31 | using System.Runtime.Remoting; | 30 | using System.Runtime.Remoting; |
32 | using System.Runtime.Remoting.Channels; | 31 | using System.Runtime.Remoting.Channels; |
33 | using System.Runtime.Remoting.Channels.Tcp; | 32 | using System.Runtime.Remoting.Channels.Tcp; |
@@ -61,20 +60,20 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer | |||
61 | // Use the object | 60 | // Use the object |
62 | if (obj.Equals(null)) | 61 | if (obj.Equals(null)) |
63 | { | 62 | { |
64 | System.Console.WriteLine("Error: unable to locate server"); | 63 | Console.WriteLine("Error: unable to locate server"); |
65 | } | 64 | } |
66 | else | 65 | else |
67 | { | 66 | { |
68 | return obj; | 67 | return obj; |
69 | } | 68 | } |
70 | } | 69 | } |
71 | catch (System.Net.Sockets.SocketException) | 70 | catch (SocketException) |
72 | { | 71 | { |
73 | System.Console.WriteLine("Error: unable to connect to server"); | 72 | Console.WriteLine("Error: unable to connect to server"); |
74 | } | 73 | } |
75 | catch (System.Runtime.Remoting.RemotingException) | 74 | catch (RemotingException) |
76 | { | 75 | { |
77 | System.Console.WriteLine("Error: unable to connect to server"); | 76 | Console.WriteLine("Error: unable to connect to server"); |
78 | } | 77 | } |
79 | return null; | 78 | return null; |
80 | } | 79 | } |
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 @@ | |||
28 | /* Original code: Tedd Hansen */ | 28 | /* Original code: Tedd Hansen */ |
29 | 29 | ||
30 | using System; | 30 | using System; |
31 | using System.Reflection; | ||
32 | using log4net; | ||
31 | using Nini.Config; | 33 | using Nini.Config; |
32 | using OpenSim.Framework.Console; | ||
33 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Environment.Interfaces; |
34 | using OpenSim.Region.Environment.Scenes; | 35 | using OpenSim.Region.Environment.Scenes; |
35 | 36 | ||
@@ -42,7 +43,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer | |||
42 | [Serializable] | 43 | [Serializable] |
43 | public class ScriptEngine : IRegionModule | 44 | public class ScriptEngine : IRegionModule |
44 | { | 45 | { |
45 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 47 | ||
47 | internal Scene World; | 48 | internal Scene World; |
48 | internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim | 49 | internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim |
@@ -53,7 +54,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer | |||
53 | Common.mySE = this; | 54 | Common.mySE = this; |
54 | } | 55 | } |
55 | 56 | ||
56 | public log4net.ILog Log | 57 | public ILog Log |
57 | { | 58 | { |
58 | get { return m_log; } | 59 | get { return m_log; } |
59 | } | 60 | } |