From ec494275a2eead0552f2f9819ceedbb4297bd7b5 Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Sun, 21 Sep 2008 01:09:54 +0000
Subject: More locks, try's and disable some things in SEC - maybe it won't
 crash now. :)

---
 .../ScriptEngine/RegionScriptEngineBase.cs          | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs')

diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs
index e6f5210..ec676f2 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs
+++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionScriptEngineBase.cs
@@ -74,16 +74,19 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine
                 m_log.Info("[" + Name + "]: Loading: " + c);
                 lock (Components)
                 {
-                    try
+                    lock (ComponentRegistry.providers)
                     {
-                        if (ComponentRegistry.providers.ContainsKey(c))
-                            Components.Add(Activator.CreateInstance(ComponentRegistry.providers[c]) as ComponentBase);
-                        else
-                            m_log.Error("[" + Name + "]: Component \"" + c + "\" not found, can not load");
-                    }
-                    catch (Exception ex)
-                    {
-                        m_log.Error("[" + Name + "]: Exception loading \"" + c + "\": " + ex.ToString());
+                        try
+                        {
+                            if (ComponentRegistry.providers.ContainsKey(c))
+                                Components.Add(Activator.CreateInstance(ComponentRegistry.providers[c]) as ComponentBase);
+                            else
+                                m_log.Error("[" + Name + "]: Component \"" + c + "\" not found, can not load");
+                        }
+                        catch (Exception ex)
+                        {
+                            m_log.Error("[" + Name + "]: Exception loading \"" + c + "\": " + ex.ToString());
+                        }
                     }
                 }
             }
-- 
cgit v1.1