5 files changed, 14 insertions, 5 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()
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 6eb292d..fdc3d79 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -173,7 +173,7 @@ namespace OpenSim
                 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
                 config.Set("startup_console_commands_file", "");
                 config.Set("shutdown_console_commands_file", "");
-                config.Set("script_engine", "DotNetEngine");
+                config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
                 config.Set("asset_database", "sqlite");
             }
 
@@ -246,7 +246,7 @@ namespace OpenSim
                 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "");
                 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", "");
 
-                m_scriptEngine = startupConfig.GetString("script_engine", "DotNetEngine");
+                m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
 
                 m_assetStorage = startupConfig.GetString("asset_database", "sqlite");
 
@@ -374,7 +374,7 @@ namespace OpenSim
 
             m_moduleLoader.PickupModules(scene, ".");
             //m_moduleLoader.PickupModules(scene, "ScriptEngines");
-            m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"), scene);
+            m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene);
             
 
             m_moduleLoader.InitialiseSharedModules(scene);
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 61438dd..e081d4e 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -41,6 +41,12 @@ asset_database = "sqlite"
 
 verbose = true
 
+; ScriptEngine
+script_engine = OpenSim.Region.ScriptEngine.DotNetEngine.dll
+;Experimental remote ScriptServer plugin:
+;script_engine = OpenSim.Region.ScriptEngine.RemoteEngine.dll
+
+
 ; if you would like to allow prim to be physical and move by physics with the physical checkbox in the client set this to true.
 physical_prim = true