aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-12-28 17:22:31 +0000
committerMelanie Thielker2008-12-28 17:22:31 +0000
commit81a4fe9db7bc3b21747d42df1c1d2c22a0187a43 (patch)
treefccd437026bfba4276b619e28856c6145dc96687
parent* More NINJA Joint physics fixes from nlin. (diff)
downloadopensim-SC_OLD-81a4fe9db7bc3b21747d42df1c1d2c22a0187a43.zip
opensim-SC_OLD-81a4fe9db7bc3b21747d42df1c1d2c22a0187a43.tar.gz
opensim-SC_OLD-81a4fe9db7bc3b21747d42df1c1d2c22a0187a43.tar.bz2
opensim-SC_OLD-81a4fe9db7bc3b21747d42df1c1d2c22a0187a43.tar.xz
Insert a 15 seconds delay before the script engine starts loading scripts
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 32714b2..340dd39 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -70,6 +70,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
70 private int m_SaveTime; 70 private int m_SaveTime;
71 private ThreadPriority m_Prio; 71 private ThreadPriority m_Prio;
72 private bool m_Enabled = false; 72 private bool m_Enabled = false;
73 private bool m_InitialStartup = true;
73 74
74// disable warning: need to keep a reference to XEngine.EventManager 75// disable warning: need to keep a reference to XEngine.EventManager
75// alive to avoid it being garbage collected 76// alive to avoid it being garbage collected
@@ -412,6 +413,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
412 413
413 public Object DoOnRezScriptQueue(Object dummy) 414 public Object DoOnRezScriptQueue(Object dummy)
414 { 415 {
416 if (m_InitialStartup)
417 {
418 m_InitialStartup = false;
419 System.Threading.Thread.Sleep(15000);
420 }
421
415 Object o; 422 Object o;
416 lock (m_CompileQueue) 423 lock (m_CompileQueue)
417 { 424 {