aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-21 21:47:00 +0000
committerMelanie Thielker2008-09-21 21:47:00 +0000
commit94aaf67dfaafbcbd4d871f674c465a34c1c1f332 (patch)
tree33476e5660a95bdf7d29d14beae67a6294af28a7 /OpenSim/Region/Application
parent* minor: warnings removal (diff)
downloadopensim-SC_OLD-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.zip
opensim-SC_OLD-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.tar.gz
opensim-SC_OLD-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.tar.bz2
opensim-SC_OLD-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.tar.xz
Change the scirpt engine loading mechanism. Script engines are now
ordinary region modules and are able to coexist in one instance. See http://opensimulator.org/wiki/ScriptEngines for details. There were changes to OpenSim.ini.example, please note DefaultScriptEngine. Also see the User docs and FAQ on the Wiki. Default is DotNetEngine.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs29
1 files changed, 2 insertions, 27 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 8eea56f..0502d80 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -78,7 +78,6 @@ namespace OpenSim
78 78
79 public string m_physicsEngine; 79 public string m_physicsEngine;
80 public string m_meshEngineName; 80 public string m_meshEngineName;
81 public string m_scriptEngine;
82 public bool m_sandbox; 81 public bool m_sandbox;
83 public bool user_accounts; 82 public bool user_accounts;
84 public bool m_gridLocalAsset; 83 public bool m_gridLocalAsset;
@@ -222,6 +221,8 @@ namespace OpenSim
222 config.Set("startup_console_commands_file", String.Empty); 221 config.Set("startup_console_commands_file", String.Empty);
223 config.Set("shutdown_console_commands_file", String.Empty); 222 config.Set("shutdown_console_commands_file", String.Empty);
224 config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); 223 config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
224 config.Set("DefaultScriptEngine", "DotNetEngine");
225
225 config.Set("asset_database", "sqlite"); 226 config.Set("asset_database", "sqlite");
226 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 227 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
227 } 228 }
@@ -321,7 +322,6 @@ namespace OpenSim
321 = startupConfig.GetString("storage_connection_string", "URI=file:OpenSim.db,version=3"); 322 = startupConfig.GetString("storage_connection_string", "URI=file:OpenSim.db,version=3");
322 m_estateConnectionString 323 m_estateConnectionString
323 = startupConfig.GetString("estate_connection_string", m_storageConnectionString); 324 = startupConfig.GetString("estate_connection_string", m_storageConnectionString);
324 m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
325 m_assetStorage = startupConfig.GetString("asset_database", "local"); 325 m_assetStorage = startupConfig.GetString("asset_database", "local");
326 m_clientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 326 m_clientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
327 } 327 }
@@ -522,31 +522,6 @@ namespace OpenSim
522 // script module can pick up events exposed by a module 522 // script module can pick up events exposed by a module
523 m_moduleLoader.InitialiseSharedModules(scene); 523 m_moduleLoader.InitialiseSharedModules(scene);
524 524
525 //m_moduleLoader.PickupModules(scene, "ScriptEngines");
526 //m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene);
527
528 if (string.IsNullOrEmpty(m_scriptEngine))
529 {
530 m_log.Info("[MODULES]: No script engine module specified");
531 }
532 else
533 {
534 m_log.Info("[MODULES]: Loading scripting engine modules");
535 foreach (string module in m_scriptEngine.Split(','))
536 {
537 string mod = module.Trim(" \t".ToCharArray()); // Clean up name
538 m_log.Info("[MODULES]: Loading scripting engine: " + mod);
539 try
540 {
541 modules.AddRange(m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", mod), scene));
542 }
543 catch (Exception ex)
544 {
545 m_log.Error("[MODULES]: Failed to load script engine: " + ex.ToString());
546 }
547 }
548 }
549
550 scene.SetModuleInterfaces(); 525 scene.SetModuleInterfaces();
551 526
552 // Prims have to be loaded after module configuration since some modules may be invoked during the load 527 // Prims have to be loaded after module configuration since some modules may be invoked during the load