diff options
author | Tedd Hansen | 2008-02-22 23:45:17 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-02-22 23:45:17 +0000 |
commit | 5eff68e6bbf42a880bd042cd350e7d12201dc2c7 (patch) | |
tree | 0fd4d3e4d0d900cd265ba88b482af07444a3b052 /OpenSim/Region/ScriptEngine/Common | |
parent | Trying to fix SVN update error: 2/2 (diff) | |
download | opensim-SC_OLD-5eff68e6bbf42a880bd042cd350e7d12201dc2c7.zip opensim-SC_OLD-5eff68e6bbf42a880bd042cd350e7d12201dc2c7.tar.gz opensim-SC_OLD-5eff68e6bbf42a880bd042cd350e7d12201dc2c7.tar.bz2 opensim-SC_OLD-5eff68e6bbf42a880bd042cd350e7d12201dc2c7.tar.xz |
Fix for error message during startup (shared thread started processing region queue before queue objects were fully operational)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs | 2 |
2 files changed, 4 insertions, 1 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 | |||
225 | //if (PleaseShutdown) | 225 | //if (PleaseShutdown) |
226 | // return; | 226 | // return; |
227 | 227 | ||
228 | if (m_ScriptEngine.m_EventQueueManager == null || m_ScriptEngine.m_EventQueueManager.eventQueue == null) | ||
229 | continue; | ||
230 | |||
228 | if (m_ScriptEngine.m_EventQueueManager.eventQueue.Count == 0) | 231 | if (m_ScriptEngine.m_EventQueueManager.eventQueue.Count == 0) |
229 | { | 232 | { |
230 | // Nothing to do? Sleep a bit waiting for something to do | 233 | // Nothing to do? Sleep a bit waiting for something to do |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs index ac115e9..0d551c6 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs | |||
@@ -54,7 +54,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
54 | public ScriptManager m_ScriptManager; // Load, unload and execute scripts | 54 | public ScriptManager m_ScriptManager; // Load, unload and execute scripts |
55 | public AppDomainManager m_AppDomainManager; // Handles loading/unloading of scripts into AppDomains | 55 | public AppDomainManager m_AppDomainManager; // Handles loading/unloading of scripts into AppDomains |
56 | public AsyncLSLCommandManager m_ASYNCLSLCommandManager; // Asyncronous LSL commands (commands that returns with an event) | 56 | public AsyncLSLCommandManager m_ASYNCLSLCommandManager; // Asyncronous LSL commands (commands that returns with an event) |
57 | public static MaintenanceThread m_MaintenanceThread; // Thread that does different kinds of maintenance, for example refreshing config and killing scripts that has been running too long | 57 | public static MaintenanceThread m_MaintenanceThread; // Thread that does different kinds of maintenance, for example refreshing config and killing scripts that has been running too long |
58 | 58 | ||
59 | public IConfigSource ConfigSource; | 59 | public IConfigSource ConfigSource; |
60 | public IConfig ScriptConfigSource; | 60 | public IConfig ScriptConfigSource; |