diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 26df758..40f48e3 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -853,7 +853,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
853 | { | 853 | { |
854 | if (m_InitialStartup) | 854 | if (m_InitialStartup) |
855 | { | 855 | { |
856 | m_InitialStartup = false; | 856 | // This delay exists to stop mono problems where script compilation and startup would stop the sim |
857 | // working properly for the session. | ||
857 | System.Threading.Thread.Sleep(15000); | 858 | System.Threading.Thread.Sleep(15000); |
858 | } | 859 | } |
859 | 860 | ||
@@ -867,14 +868,16 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
867 | { | 868 | { |
868 | scriptsStarted++; | 869 | scriptsStarted++; |
869 | 870 | ||
870 | // if (scriptsStarted % 50 == 0) | 871 | if (m_InitialStartup) |
871 | // m_log.DebugFormat( | 872 | if (scriptsStarted % 50 == 0) |
872 | // "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.RegionInfo.RegionName); | 873 | m_log.InfoFormat( |
874 | "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.RegionInfo.RegionName); | ||
873 | } | 875 | } |
874 | } | 876 | } |
875 | 877 | ||
876 | // m_log.DebugFormat( | 878 | if (m_InitialStartup) |
877 | // "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.RegionInfo.RegionName); | 879 | m_log.InfoFormat( |
880 | "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.RegionInfo.RegionName); | ||
878 | 881 | ||
879 | // NOTE: Despite having a lockless queue, this lock is required | 882 | // NOTE: Despite having a lockless queue, this lock is required |
880 | // to make sure there is never no compile thread while there | 883 | // to make sure there is never no compile thread while there |
@@ -888,6 +891,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
888 | m_ScriptErrorMessage); | 891 | m_ScriptErrorMessage); |
889 | 892 | ||
890 | m_ScriptFailCount = 0; | 893 | m_ScriptFailCount = 0; |
894 | m_InitialStartup = false; | ||
891 | 895 | ||
892 | return null; | 896 | return null; |
893 | } | 897 | } |