diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs index 45cfced..22cffff 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs | |||
@@ -107,7 +107,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
107 | public ScriptManager(ScriptEngineBase.ScriptEngine scriptEngine) | 107 | public ScriptManager(ScriptEngineBase.ScriptEngine scriptEngine) |
108 | { | 108 | { |
109 | m_scriptEngine = scriptEngine; | 109 | m_scriptEngine = scriptEngine; |
110 | ReadConfig(); | 110 | // We should not read config during startup as ScriptEngine may not have config object yet |
111 | |||
111 | AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve); | 112 | AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve); |
112 | scriptLoadUnloadThread = new Thread(ScriptLoadUnloadThreadLoop); | 113 | scriptLoadUnloadThread = new Thread(ScriptLoadUnloadThreadLoop); |
113 | scriptLoadUnloadThread.Name = "ScriptLoadUnloadThread"; | 114 | scriptLoadUnloadThread.Name = "ScriptLoadUnloadThread"; |