aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/RemoteServer
diff options
context:
space:
mode:
authorAdam Frisby2008-04-21 07:09:17 +0000
committerAdam Frisby2008-04-21 07:09:17 +0000
commitfef3b3689492dea63693c964bcdbec9f5137eb5e (patch)
tree7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Region/ScriptEngine/RemoteServer
parent* Terrain Module code has been reformatted to comply with guidelines. (diff)
downloadopensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip
opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz
opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2
opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Region/ScriptEngine/RemoteServer')
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs13
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs7
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
28using System; 28using System;
29using System.Collections.Generic; 29using System.Net.Sockets;
30using System.Text;
31using System.Runtime.Remoting; 30using System.Runtime.Remoting;
32using System.Runtime.Remoting.Channels; 31using System.Runtime.Remoting.Channels;
33using System.Runtime.Remoting.Channels.Tcp; 32using 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
30using System; 30using System;
31using System.Reflection;
32using log4net;
31using Nini.Config; 33using Nini.Config;
32using OpenSim.Framework.Console;
33using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
34using OpenSim.Region.Environment.Scenes; 35using 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 }