aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine
diff options
context:
space:
mode:
authorMelanie2012-08-25 18:08:10 +0100
committerMelanie2012-08-25 18:08:10 +0100
commit007a45aa76af0029a43b634a0a44a48f15ea5654 (patch)
tree5a5202f11b7b54953ea462d70a25dec77502f5eb /OpenSim/Region/ScriptEngine/XEngine
parentMerge branch 'master' into careminster (diff)
parentFollowing on from f8a89a79, do not allow more than one 'type' folder (e.g. ca... (diff)
downloadopensim-SC_OLD-007a45aa76af0029a43b634a0a44a48f15ea5654.zip
opensim-SC_OLD-007a45aa76af0029a43b634a0a44a48f15ea5654.tar.gz
opensim-SC_OLD-007a45aa76af0029a43b634a0a44a48f15ea5654.tar.bz2
opensim-SC_OLD-007a45aa76af0029a43b634a0a44a48f15ea5654.tar.xz
Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 2d17977..9f05666 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -994,6 +994,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
994 // This delay exists to stop mono problems where script compilation and startup would stop the sim 994 // This delay exists to stop mono problems where script compilation and startup would stop the sim
995 // working properly for the session. 995 // working properly for the session.
996 System.Threading.Thread.Sleep(m_StartDelay); 996 System.Threading.Thread.Sleep(m_StartDelay);
997
998 m_log.InfoFormat("[XEngine]: Performing initial script startup on {0}", m_Scene.Name);
997 } 999 }
998 1000
999 object[] o; 1001 object[] o;
@@ -1009,13 +1011,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1009 if (m_InitialStartup) 1011 if (m_InitialStartup)
1010 if (scriptsStarted % 50 == 0) 1012 if (scriptsStarted % 50 == 0)
1011 m_log.InfoFormat( 1013 m_log.InfoFormat(
1012 "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.RegionInfo.RegionName); 1014 "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.Name);
1013 } 1015 }
1014 } 1016 }
1015 1017
1016 if (m_InitialStartup) 1018 if (m_InitialStartup)
1017 m_log.InfoFormat( 1019 m_log.InfoFormat(
1018 "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.RegionInfo.RegionName); 1020 "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.Name);
1019 1021
1020 // NOTE: Despite having a lockless queue, this lock is required 1022 // NOTE: Despite having a lockless queue, this lock is required
1021 // to make sure there is never no compile thread while there 1023 // to make sure there is never no compile thread while there