aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/ScriptServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/ScriptServer')
-rw-r--r--OpenSim/Grid/ScriptServer/Application.cs5
-rw-r--r--OpenSim/Grid/ScriptServer/RemotingObject.cs1
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServerMain.cs1
3 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Grid/ScriptServer/Application.cs b/OpenSim/Grid/ScriptServer/Application.cs
index 5076618..7b62727 100644
--- a/OpenSim/Grid/ScriptServer/Application.cs
+++ b/OpenSim/Grid/ScriptServer/Application.cs
@@ -35,11 +35,12 @@ namespace OpenSim.Grid.ScriptServer
35 35
36 private static void Main(string[] args) 36 private static void Main(string[] args)
37 { 37 {
38 AppDomain.CurrentDomain.UnhandledException +=
39 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
40
38 // Application is starting 41 // Application is starting
39 SE = new ScriptServerMain(); 42 SE = new ScriptServerMain();
40 43
41 AppDomain.CurrentDomain.UnhandledException +=
42 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
43 } 44 }
44 45
45 private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) 46 private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
diff --git a/OpenSim/Grid/ScriptServer/RemotingObject.cs b/OpenSim/Grid/ScriptServer/RemotingObject.cs
index 179a2f6..2d5936e 100644
--- a/OpenSim/Grid/ScriptServer/RemotingObject.cs
+++ b/OpenSim/Grid/ScriptServer/RemotingObject.cs
@@ -14,6 +14,7 @@ namespace OpenSim.Grid.ScriptServer
14 // NOTE! CURRENTLY JUST HARDWIRED DOTNETENGINE! 14 // NOTE! CURRENTLY JUST HARDWIRED DOTNETENGINE!
15 public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine ScriptEngine = new OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine(); 15 public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine ScriptEngine = new OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine();
16 16
17
17 /// <summary> 18 /// <summary>
18 /// Receives calls from remote grids. 19 /// Receives calls from remote grids.
19 /// </summary> 20 /// </summary>
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index 8bba38a..884a09e 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -54,6 +54,7 @@ namespace OpenSim.Grid.ScriptServer
54 //ScriptEngines = new ScriptEngineManager(this, m_log); 54 //ScriptEngines = new ScriptEngineManager(this, m_log);
55 m_RemotingServer = new RemotingServer(); 55 m_RemotingServer = new RemotingServer();
56 m_RemotingServer.CreateServer(listenPort, "DotNetEngine"); 56 m_RemotingServer.CreateServer(listenPort, "DotNetEngine");
57 System.Console.ReadLine();
57 } 58 }
58 59
59 ~ScriptServerMain() 60 ~ScriptServerMain()