Full .dll-name in config option for ScriptEngine. Loading only scriptengine specified in config.

ScriptServer will still not start!

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
 
         private static void Main(string[] args)
         {
+            AppDomain.CurrentDomain.UnhandledException +=
+                new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
+
             // Application is starting
             SE = new ScriptServerMain();
 
-            AppDomain.CurrentDomain.UnhandledException +=
-                new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
         }
 
         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
         // NOTE! CURRENTLY JUST HARDWIRED DOTNETENGINE!
         public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine ScriptEngine = new OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine();
 
+
         /// <summary>
         /// Receives calls from remote grids.
         /// </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
             //ScriptEngines = new ScriptEngineManager(this, m_log);
             m_RemotingServer = new RemotingServer();
             m_RemotingServer.CreateServer(listenPort, "DotNetEngine");
+            System.Console.ReadLine();
         }
 
         ~ScriptServerMain()