diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs index a6d1019..ea8ae1f 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs | |||
@@ -86,13 +86,18 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
86 | get { return m_log; } | 86 | get { return m_log; } |
87 | } | 87 | } |
88 | 88 | ||
89 | public void InitializeEngine(Scene Sceneworld, LogBase logger, bool HookUpToServer, ScriptManager newScriptManager) | 89 | public void InitializeEngine(Scene Sceneworld, IConfigSource config, LogBase logger, bool HookUpToServer, ScriptManager newScriptManager) |
90 | { | 90 | { |
91 | World = Sceneworld; | 91 | World = Sceneworld; |
92 | m_log = logger; | 92 | m_log = logger; |
93 | ScriptConfigSource = ConfigSource.Configs[ScriptEngineName]; | 93 | ConfigSource = config; |
94 | Log.Verbose(ScriptEngineName, "ScriptEngine initializing"); | ||
95 | Log.Verbose(ScriptEngineName, "Reading configuration from config section \"" + ScriptEngineName + "\""); | ||
94 | 96 | ||
95 | Log.Verbose(ScriptEngineName, "DotNet & LSL ScriptEngine initializing"); | 97 | // Make sure we have config |
98 | if (ConfigSource.Configs[ScriptEngineName] == null) | ||
99 | ConfigSource.AddConfig(ScriptEngineName); | ||
100 | ScriptConfigSource = ConfigSource.Configs[ScriptEngineName]; | ||
96 | 101 | ||
97 | //m_logger.Status(ScriptEngineName, "InitializeEngine"); | 102 | //m_logger.Status(ScriptEngineName, "InitializeEngine"); |
98 | 103 | ||