diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 7e31d60..d585a07 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
93 | /// </summary> | 93 | /// </summary> |
94 | public void StartScripts() | 94 | public void StartScripts() |
95 | { | 95 | { |
96 | m_log.InfoFormat("[SCENE]: Starting scripts in {0}, please wait.", RegionInfo.RegionName); | 96 | // m_log.InfoFormat("[SCENE]: Starting scripts in {0}, please wait.", RegionInfo.RegionName); |
97 | 97 | ||
98 | IScriptModule[] engines = RequestModuleInterfaces<IScriptModule>(); | 98 | IScriptModule[] engines = RequestModuleInterfaces<IScriptModule>(); |
99 | 99 | ||
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 5311313..78096f8 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -923,6 +923,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
923 | // This delay exists to stop mono problems where script compilation and startup would stop the sim | 923 | // This delay exists to stop mono problems where script compilation and startup would stop the sim |
924 | // working properly for the session. | 924 | // working properly for the session. |
925 | System.Threading.Thread.Sleep(m_StartDelay); | 925 | System.Threading.Thread.Sleep(m_StartDelay); |
926 | |||
927 | m_log.InfoFormat("[XEngine]: Performing initial script startup on {0}", m_Scene.Name); | ||
926 | } | 928 | } |
927 | 929 | ||
928 | object[] o; | 930 | object[] o; |
@@ -938,13 +940,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
938 | if (m_InitialStartup) | 940 | if (m_InitialStartup) |
939 | if (scriptsStarted % 50 == 0) | 941 | if (scriptsStarted % 50 == 0) |
940 | m_log.InfoFormat( | 942 | m_log.InfoFormat( |
941 | "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.RegionInfo.RegionName); | 943 | "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.Name); |
942 | } | 944 | } |
943 | } | 945 | } |
944 | 946 | ||
945 | if (m_InitialStartup) | 947 | if (m_InitialStartup) |
946 | m_log.InfoFormat( | 948 | m_log.InfoFormat( |
947 | "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.RegionInfo.RegionName); | 949 | "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.Name); |
948 | 950 | ||
949 | // NOTE: Despite having a lockless queue, this lock is required | 951 | // NOTE: Despite having a lockless queue, this lock is required |
950 | // to make sure there is never no compile thread while there | 952 | // to make sure there is never no compile thread while there |