aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Grid/ScriptServer/Application.cs12
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineManager/ScriptEngineInterface.cs (renamed from OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineInterface.cs)0
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineManager/ScriptEngineLoader.cs (renamed from OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineLoader.cs)0
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs (renamed from OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngines.cs)6
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServerMain.cs4
5 files changed, 17 insertions, 5 deletions
diff --git a/OpenSim/Grid/ScriptServer/Application.cs b/OpenSim/Grid/ScriptServer/Application.cs
index e7a6590..780f037 100644
--- a/OpenSim/Grid/ScriptServer/Application.cs
+++ b/OpenSim/Grid/ScriptServer/Application.cs
@@ -40,6 +40,18 @@ namespace OpenSim.Grid.ScriptServer
40 { 40 {
41 // Application is starting 41 // Application is starting
42 SE = new ScriptServerMain(); 42 SE = new ScriptServerMain();
43
44 System.AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
45 }
46
47 static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
48 {
49 Console.WriteLine("");
50 Console.WriteLine("APPLICATION EXCEPTION DETECTED");
51 Console.WriteLine("");
52 Console.WriteLine("Application is terminating: " + e.IsTerminating.ToString());
53 Console.WriteLine("Exception:");
54 Console.WriteLine(e.ExceptionObject.ToString());
43 } 55 }
44 56
45 } 57 }
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineInterface.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineManager/ScriptEngineInterface.cs
index 7440bcb..7440bcb 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineInterface.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineManager/ScriptEngineInterface.cs
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineLoader.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineManager/ScriptEngineLoader.cs
index 8b07ab0..8b07ab0 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineLoader.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineManager/ScriptEngineLoader.cs
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngines.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
index 0313edf..faa859d 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngines.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
@@ -5,7 +5,7 @@ using OpenSim.Framework.Console;
5 5
6namespace OpenSim.Grid.ScriptServer 6namespace OpenSim.Grid.ScriptServer
7{ 7{
8 internal class ScriptEngines 8 internal class ScriptEngineManager
9 { 9 {
10 private LogBase m_log; 10 private LogBase m_log;
11 private ScriptEngineLoader ScriptEngineLoader; 11 private ScriptEngineLoader ScriptEngineLoader;
@@ -13,7 +13,7 @@ namespace OpenSim.Grid.ScriptServer
13 private ScriptServerMain m_ScriptServerMain; 13 private ScriptServerMain m_ScriptServerMain;
14 14
15 // Initialize 15 // Initialize
16 public ScriptEngines(ScriptServerMain scm, LogBase logger) 16 public ScriptEngineManager(ScriptServerMain scm, LogBase logger)
17 { 17 {
18 m_ScriptServerMain = scm; 18 m_ScriptServerMain = scm;
19 m_log = logger; 19 m_log = logger;
@@ -22,7 +22,7 @@ namespace OpenSim.Grid.ScriptServer
22 // Temp - we should not load during initialize... Loading should be done later. 22 // Temp - we should not load during initialize... Loading should be done later.
23 LoadEngine("DotNetScriptEngine"); 23 LoadEngine("DotNetScriptEngine");
24 } 24 }
25 ~ScriptEngines() 25 ~ScriptEngineManager()
26 { 26 {
27 } 27 }
28 28
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index f85cf98..8352859 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -11,7 +11,7 @@ namespace OpenSim.Grid.ScriptServer
11 { 11 {
12 private readonly string m_logFilename = ("region-console.log"); 12 private readonly string m_logFilename = ("region-console.log");
13 internal RegionCommManager RegionScriptDaemon; // Listen for incoming from region 13 internal RegionCommManager RegionScriptDaemon; // Listen for incoming from region
14 internal ScriptEngines ScriptEngines; // Loads scriptengines 14 internal ScriptEngineManager ScriptEngines; // Loads scriptengines
15 private LogBase m_log; 15 private LogBase m_log;
16 16
17 public ScriptServerMain() 17 public ScriptServerMain()
@@ -19,7 +19,7 @@ namespace OpenSim.Grid.ScriptServer
19 m_log = CreateLog(); 19 m_log = CreateLog();
20 20
21 RegionScriptDaemon = new RegionCommManager(this, m_log); 21 RegionScriptDaemon = new RegionCommManager(this, m_log);
22 ScriptEngines = new ScriptEngines(this, m_log); 22 ScriptEngines = new ScriptEngineManager(this, m_log);
23 23
24 } 24 }
25 25