diff options
| author | Tedd Hansen | 2008-02-01 23:44:02 +0000 |
|---|---|---|
| committer | Tedd Hansen | 2008-02-01 23:44:02 +0000 |
| commit | 47154531590d29ed204a8c1cc5226077b2014c29 (patch) | |
| tree | 841c907501c59543d4657463534239d53eba9d46 /OpenSim | |
| parent | SCRIPTING STILL BROKEN (diff) | |
| download | opensim-SC-47154531590d29ed204a8c1cc5226077b2014c29.zip opensim-SC-47154531590d29ed204a8c1cc5226077b2014c29.tar.gz opensim-SC-47154531590d29ed204a8c1cc5226077b2014c29.tar.bz2 opensim-SC-47154531590d29ed204a8c1cc5226077b2014c29.tar.xz | |
Bugfix, maybe it won't crash during startup and crash somewhere else instead? :)
Diffstat (limited to 'OpenSim')
| -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"; |