diff options
author | Tedd Hansen | 2008-02-18 14:21:51 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-02-18 14:21:51 +0000 |
commit | c62328950a3e4ad30dbe972db11d05ca7519d6de (patch) | |
tree | 4610c7af86f2831f085334aed67f50dab615736b /OpenSim/Region/Application | |
parent | bring back some script engine debugging, hoping this will help track down the... (diff) | |
download | opensim-SC-c62328950a3e4ad30dbe972db11d05ca7519d6de.zip opensim-SC-c62328950a3e4ad30dbe972db11d05ca7519d6de.tar.gz opensim-SC-c62328950a3e4ad30dbe972db11d05ca7519d6de.tar.bz2 opensim-SC-c62328950a3e4ad30dbe972db11d05ca7519d6de.tar.xz |
More exception checks and crash hints
If no scriptengine is specified then don't try to load any.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 1e5fcfb..8c6ea26 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -181,7 +181,7 @@ namespace OpenSim | |||
181 | config.Set("storage_prim_inventories", true); | 181 | config.Set("storage_prim_inventories", true); |
182 | config.Set("startup_console_commands_file", String.Empty); | 182 | config.Set("startup_console_commands_file", String.Empty); |
183 | config.Set("shutdown_console_commands_file", String.Empty); | 183 | config.Set("shutdown_console_commands_file", String.Empty); |
184 | config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); | 184 | config.Set("script_engine", ""); |
185 | config.Set("asset_database", "sqlite"); | 185 | config.Set("asset_database", "sqlite"); |
186 | } | 186 | } |
187 | 187 | ||
@@ -264,7 +264,7 @@ namespace OpenSim | |||
264 | m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty); | 264 | m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty); |
265 | m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty); | 265 | m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty); |
266 | 266 | ||
267 | m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); | 267 | m_scriptEngine = startupConfig.GetString("script_engine", ""); |
268 | 268 | ||
269 | m_assetStorage = startupConfig.GetString("asset_database", "sqlite"); | 269 | m_assetStorage = startupConfig.GetString("asset_database", "sqlite"); |
270 | 270 | ||
@@ -449,18 +449,26 @@ namespace OpenSim | |||
449 | m_moduleLoader.PickupModules(scene, "."); | 449 | m_moduleLoader.PickupModules(scene, "."); |
450 | //m_moduleLoader.PickupModules(scene, "ScriptEngines"); | 450 | //m_moduleLoader.PickupModules(scene, "ScriptEngines"); |
451 | //m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene); | 451 | //m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene); |
452 | m_log.Info("[MODULES]: Loading scripting engine modules"); | 452 | |
453 | foreach (string module in m_scriptEngine.Split(',')) | 453 | if (string.IsNullOrEmpty(m_scriptEngine)) |
454 | { | 454 | { |
455 | string mod = module.Trim(" \t".ToCharArray()); // Clean up name | 455 | m_log.Info("[MODULES]: No script engien module specified"); |
456 | m_log.Info("[MODULES]: Loading scripting engine: " + mod); | 456 | } |
457 | try | 457 | else |
458 | { | 458 | { |
459 | m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", mod), scene); | 459 | m_log.Info("[MODULES]: Loading scripting engine modules"); |
460 | } | 460 | foreach (string module in m_scriptEngine.Split(',')) |
461 | catch (Exception ex) | ||
462 | { | 461 | { |
463 | m_log.Error("[MODULES]: Failed to load script engine: " + ex.ToString()); | 462 | string mod = module.Trim(" \t".ToCharArray()); // Clean up name |
463 | m_log.Info("[MODULES]: Loading scripting engine: " + mod); | ||
464 | try | ||
465 | { | ||
466 | m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", mod), scene); | ||
467 | } | ||
468 | catch (Exception ex) | ||
469 | { | ||
470 | m_log.Error("[MODULES]: Failed to load script engine: " + ex.ToString()); | ||
471 | } | ||
464 | } | 472 | } |
465 | } | 473 | } |
466 | 474 | ||