diff options
author | Tedd Hansen | 2008-01-02 15:58:33 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-01-02 15:58:33 +0000 |
commit | 198dea28add519a5cd14b47a01345cf4207b4ee3 (patch) | |
tree | d04822584c5634aaa07c7c7550c0dde3668d739e /OpenSim/Region/Application | |
parent | * Fixed an issue where the PacketPool would ZeroDecodeCommand into a too smal... (diff) | |
download | opensim-SC_OLD-198dea28add519a5cd14b47a01345cf4207b4ee3.zip opensim-SC_OLD-198dea28add519a5cd14b47a01345cf4207b4ee3.tar.gz opensim-SC_OLD-198dea28add519a5cd14b47a01345cf4207b4ee3.tar.bz2 opensim-SC_OLD-198dea28add519a5cd14b47a01345cf4207b4ee3.tar.xz |
Full .dll-name in config option for ScriptEngine. Loading only scriptengine specified in config.
ScriptServer will still not start!
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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); |