SCRIPT SUPPORT IS STILL BROKEN.

Bugfix: Scripts exceeding max and set to be killed were not killed, only removed.
Added ability to re-read configuration while OpenSim is running
All regions now sharing one MaintenanceThread
New MaintenanceThread:
- checks for script execution timeout
- re-reads config
- starts/stops threads if thread active count becomes too high/low compared to config
Speed increase on event execution:
- Reuse of try{}catch{} blocks
- Time calculation on event execution

1 files changed, 12 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
index fa40947..cfcc36e 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
@@ -55,6 +55,15 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
         public IConfig ScriptConfigSource;
         public abstract string ScriptConfigSourceName { get; }
 
+        /// <summary>
+        /// How many seconds between re-reading config-file. 0 = never. ScriptEngine will try to adjust to new config changes.
+        /// </summary>
+        public int ReReadConfigFileSeconds {
+            get { return (int)(ReReadConfigFilens / 10000); }
+            set { ReReadConfigFilens = value * 10000; }
+        }
+        public long ReReadConfigFilens = 0;
+
         public ScriptManager GetScriptManager()
         {
             return _GetScriptManager();
@@ -93,6 +102,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
             m_AppDomainManager = new AppDomainManager(ScriptConfigSource.GetInt("ScriptsPerAppDomain", 1));
             m_LSLLongCmdHandler = new LSLLongCmdHandler(this);
 
+            ReReadConfigFileSeconds = ScriptConfigSource.GetInt("ReReadConfig", 0);
+
+
             // Should we iterate the region for scripts that needs starting?
             // Or can we assume we are loaded before anything else so we can use proper events?
         }