aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Grid/ScriptServer/Application.cs5
-rw-r--r--OpenSim/Grid/ScriptServer/RemotingObject.cs1
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServerMain.cs1
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs6
-rw-r--r--bin/OpenSim.ini.example6
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
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()
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
173 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); 173 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
174 config.Set("startup_console_commands_file", ""); 174 config.Set("startup_console_commands_file", "");
175 config.Set("shutdown_console_commands_file", ""); 175 config.Set("shutdown_console_commands_file", "");
176 config.Set("script_engine", "DotNetEngine"); 176 config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
177 config.Set("asset_database", "sqlite"); 177 config.Set("asset_database", "sqlite");
178 } 178 }
179 179
@@ -246,7 +246,7 @@ namespace OpenSim
246 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", ""); 246 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "");
247 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", ""); 247 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", "");
248 248
249 m_scriptEngine = startupConfig.GetString("script_engine", "DotNetEngine"); 249 m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
250 250
251 m_assetStorage = startupConfig.GetString("asset_database", "sqlite"); 251 m_assetStorage = startupConfig.GetString("asset_database", "sqlite");
252 252
@@ -374,7 +374,7 @@ namespace OpenSim
374 374
375 m_moduleLoader.PickupModules(scene, "."); 375 m_moduleLoader.PickupModules(scene, ".");
376 //m_moduleLoader.PickupModules(scene, "ScriptEngines"); 376 //m_moduleLoader.PickupModules(scene, "ScriptEngines");
377 m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"), scene); 377 m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene);
378 378
379 379
380 m_moduleLoader.InitialiseSharedModules(scene); 380 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"
41 41
42verbose = true 42verbose = true
43 43
44; ScriptEngine
45script_engine = OpenSim.Region.ScriptEngine.DotNetEngine.dll
46;Experimental remote ScriptServer plugin:
47;script_engine = OpenSim.Region.ScriptEngine.RemoteEngine.dll
48
49
44; 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. 50; 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.
45physical_prim = true 51physical_prim = true
46 52