diff options
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index e961e76..26df758 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -855,13 +855,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
855 | { | 855 | { |
856 | m_InitialStartup = false; | 856 | m_InitialStartup = false; |
857 | System.Threading.Thread.Sleep(15000); | 857 | System.Threading.Thread.Sleep(15000); |
858 | |||
859 | if (m_CompileQueue.Count == 0) | ||
860 | { | ||
861 | // No scripts on region, so won't get triggered later | ||
862 | // by the queue becoming empty so we trigger it here | ||
863 | m_Scene.EventManager.TriggerEmptyScriptCompileQueue(0, String.Empty); | ||
864 | } | ||
865 | } | 858 | } |
866 | 859 | ||
867 | object[] o; | 860 | object[] o; |
@@ -889,11 +882,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
889 | // due to a race condition | 882 | // due to a race condition |
890 | // | 883 | // |
891 | lock (m_CompileQueue) | 884 | lock (m_CompileQueue) |
892 | { | ||
893 | m_CurrentCompile = null; | 885 | m_CurrentCompile = null; |
894 | } | 886 | |
895 | m_Scene.EventManager.TriggerEmptyScriptCompileQueue(m_ScriptFailCount, | 887 | m_Scene.EventManager.TriggerEmptyScriptCompileQueue(m_ScriptFailCount, |
896 | m_ScriptErrorMessage); | 888 | m_ScriptErrorMessage); |
889 | |||
897 | m_ScriptFailCount = 0; | 890 | m_ScriptFailCount = 0; |
898 | 891 | ||
899 | return null; | 892 | return null; |