aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2008-02-22 14:53:26 +0000
committerTedd Hansen2008-02-22 14:53:26 +0000
commit879a2604983631df7a578fe6dba2afe9d65b5ea5 (patch)
tree8d1ede42d217d6c4cd94a9f07cc06d9b4bbedc44
parentExecution threads are now shared between regions too. Default thread count re... (diff)
downloadopensim-SC-879a2604983631df7a578fe6dba2afe9d65b5ea5.zip
opensim-SC-879a2604983631df7a578fe6dba2afe9d65b5ea5.tar.gz
opensim-SC-879a2604983631df7a578fe6dba2afe9d65b5ea5.tar.bz2
opensim-SC-879a2604983631df7a578fe6dba2afe9d65b5ea5.tar.xz
Minor annoying Exception-bug fixed
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs2
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
index 0911afb..af88183 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
@@ -27,6 +27,7 @@
27*/ 27*/
28 28
29using System; 29using System;
30using System.Collections;
30using System.Collections.Generic; 31using System.Collections.Generic;
31using System.Text; 32using System.Text;
32using System.Threading; 33using System.Threading;
@@ -132,7 +133,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
132 if (PleaseShutdown) 133 if (PleaseShutdown)
133 return; 134 return;
134 135
135 foreach (ScriptEngine m_ScriptEngine in ScriptEngine.ScriptEngines) 136 foreach (ScriptEngine m_ScriptEngine in new ArrayList(ScriptEngine.ScriptEngines))
136 { 137 {
137 lastScriptEngine = m_ScriptEngine; 138 lastScriptEngine = m_ScriptEngine;
138 if (m_ScriptEngine != null) 139 if (m_ScriptEngine != null)
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
index 0d087ed..60416eb 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
132 public void ReadConfig() 132 public void ReadConfig()
133 { 133 {
134#if DEBUG 134#if DEBUG
135 m_log.Debug("[" + ScriptEngineName + "]: Refreshing configuration for all modules"); 135 //m_log.Debug("[" + ScriptEngineName + "]: Refreshing configuration for all modules");
136#endif 136#endif
137 RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 30); 137 RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 30);
138 138