aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-18 22:24:52 +0100
committerJustin Clark-Casey (justincc)2012-07-18 22:24:52 +0100
commit1971b6bb4f0f15c08dedee95e730ff6485d8c7cf (patch)
treedd2f7887dac47fe053bd0bffb034e461481ca1e3
parentFix bug where region ready would be triggered a second time if a script was r... (diff)
downloadopensim-SC_OLD-1971b6bb4f0f15c08dedee95e730ff6485d8c7cf.zip
opensim-SC_OLD-1971b6bb4f0f15c08dedee95e730ff6485d8c7cf.tar.gz
opensim-SC_OLD-1971b6bb4f0f15c08dedee95e730ff6485d8c7cf.tar.bz2
opensim-SC_OLD-1971b6bb4f0f15c08dedee95e730ff6485d8c7cf.tar.xz
Stop the 15 second initial script compile wait if a script is being rezzed on a previously empty region.
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 7a9c80c..da344d6 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -644,6 +644,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
644 m_Scene.EventManager.OnGetScriptRunning += OnGetScriptRunning; 644 m_Scene.EventManager.OnGetScriptRunning += OnGetScriptRunning;
645 m_Scene.EventManager.OnShutdown += OnShutdown; 645 m_Scene.EventManager.OnShutdown += OnShutdown;
646 646
647 // If region ready has been triggered, then the region had no scripts to compile and completed its other
648 // work.
649 m_Scene.EventManager.OnRegionReady += s => m_InitialStartup = false;
650
647 if (m_SleepTime > 0) 651 if (m_SleepTime > 0)
648 { 652 {
649 m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance), 653 m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance),