diff options
Diffstat (limited to 'OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs b/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs index ab39568..c89da81 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/ComponentLoader.cs | |||
@@ -72,13 +72,19 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine | |||
72 | { | 72 | { |
73 | // We have found an type which is derived from ProdiverBase, add it to provider list | 73 | // We have found an type which is derived from ProdiverBase, add it to provider list |
74 | m_log.InfoFormat("[ScriptEngine]: Adding component: {0}", componentType.Name); | 74 | m_log.InfoFormat("[ScriptEngine]: Adding component: {0}", componentType.Name); |
75 | ComponentRegistry.providers.Add(componentType.Name, componentType); | 75 | lock (ComponentRegistry.providers) |
76 | { | ||
77 | ComponentRegistry.providers.Add(componentType.Name, componentType); | ||
78 | } | ||
76 | } | 79 | } |
77 | if (componentType.IsSubclassOf(typeof(RegionScriptEngineBase))) | 80 | if (componentType.IsSubclassOf(typeof(RegionScriptEngineBase))) |
78 | { | 81 | { |
79 | // We have found an type which is derived from RegionScriptEngineBase, add it to engine list | 82 | // We have found an type which is derived from RegionScriptEngineBase, add it to engine list |
80 | m_log.InfoFormat("[ScriptEngine]: Adding script engine: {0}", componentType.Name); | 83 | m_log.InfoFormat("[ScriptEngine]: Adding script engine: {0}", componentType.Name); |
81 | ComponentRegistry.scriptEngines.Add(componentType.Name, componentType); | 84 | lock (ComponentRegistry.scriptEngines) |
85 | { | ||
86 | ComponentRegistry.scriptEngines.Add(componentType.Name, componentType); | ||
87 | } | ||
82 | } | 88 | } |
83 | } | 89 | } |
84 | } | 90 | } |