From 5eff68e6bbf42a880bd042cd350e7d12201dc2c7 Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Fri, 22 Feb 2008 23:45:17 +0000
Subject: Fix for error message during startup (shared thread started
 processing region queue before queue objects were fully operational)

---
 .../ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs      | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs')

diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
index caf043d..3a237da 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
@@ -225,6 +225,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
                     //if (PleaseShutdown)
                     //    return;
 
+                    if (m_ScriptEngine.m_EventQueueManager == null || m_ScriptEngine.m_EventQueueManager.eventQueue == null)
+                        continue;
+
                     if (m_ScriptEngine.m_EventQueueManager.eventQueue.Count == 0)
                     {
                         // Nothing to do? Sleep a bit waiting for something to do
-- 
cgit v1.1