From 1971b6bb4f0f15c08dedee95e730ff6485d8c7cf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 18 Jul 2012 22:24:52 +0100
Subject: Stop the 15 second initial script compile wait if a script is being
 rezzed on a previously empty region.

---
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')

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
             m_Scene.EventManager.OnGetScriptRunning += OnGetScriptRunning;
             m_Scene.EventManager.OnShutdown += OnShutdown;
 
+            // If region ready has been triggered, then the region had no scripts to compile and completed its other
+            // work.
+            m_Scene.EventManager.OnRegionReady += s => m_InitialStartup = false;
+
             if (m_SleepTime > 0)
             {
                 m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance),
-- 
cgit v1.1