Fix for error message during startup (shared thread started processing region queue before queue objects were fully operational)

1 files changed, 3 insertions, 0 deletions

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