OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some misplaced code made scripts never start :)

afrisby-rexmerge
Tedd Hansen 2008-02-22 20:06:44 +00:00
parent 0fb4374c1a
commit e741dcde6a
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
View File

@ -129,7 +129,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
long Last_maxFunctionExecutionTimens = 0; // DateTime.Now.Ticks; long Last_maxFunctionExecutionTimens = 0; // DateTime.Now.Ticks;
long Last_ReReadConfigFilens = DateTime.Now.Ticks; long Last_ReReadConfigFilens = DateTime.Now.Ticks;
long Last_MaintenanceRun = 0;
int MaintenanceLoopTicks_ScriptLoadUnload_Count = 0; int MaintenanceLoopTicks_ScriptLoadUnload_Count = 0;
int MaintenanceLoopTicks_Other_Count = 0; int MaintenanceLoopTicks_Other_Count = 0;
@ -140,8 +139,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
while (true) while (true)
{ {
System.Threading.Thread.Sleep(MaintenanceLoopms); // Sleep before next pass System.Threading.Thread.Sleep(MaintenanceLoopms); // Sleep before next pass
//if (PleaseShutdown)
// return; // Increase our counters
MaintenanceLoopTicks_ScriptLoadUnload_Count++; MaintenanceLoopTicks_ScriptLoadUnload_Count++;
MaintenanceLoopTicks_Other_Count++; MaintenanceLoopTicks_Other_Count++;
@ -150,12 +149,12 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
{ {
lastScriptEngine = m_ScriptEngine; lastScriptEngine = m_ScriptEngine;
// Re-reading config every x seconds // Re-reading config every x seconds
if (m_ScriptEngine.RefreshConfigFilens > 0) if (MaintenanceLoopTicks_Other_Count >= MaintenanceLoopTicks_Other)
{ {
MaintenanceLoopTicks_Other_Count = 0;
if (MaintenanceLoopTicks_Other_Count >= MaintenanceLoopTicks_Other) if (m_ScriptEngine.RefreshConfigFilens > 0)
{ {
MaintenanceLoopTicks_Other_Count = 0;
// Check if its time to re-read config // Check if its time to re-read config
if (DateTime.Now.Ticks - Last_ReReadConfigFilens > if (DateTime.Now.Ticks - Last_ReReadConfigFilens >
m_ScriptEngine.RefreshConfigFilens) m_ScriptEngine.RefreshConfigFilens)
@ -185,13 +184,13 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
} }
} }
if (MaintenanceLoopTicks_ScriptLoadUnload_Count >= MaintenanceLoopTicks_ScriptLoadUnload) }
{ if (MaintenanceLoopTicks_ScriptLoadUnload_Count >= MaintenanceLoopTicks_ScriptLoadUnload)
MaintenanceLoopTicks_ScriptLoadUnload_Count = 0; {
// LOAD / UNLOAD SCRIPTS MaintenanceLoopTicks_ScriptLoadUnload_Count = 0;
if (m_ScriptEngine.m_ScriptManager != null) // LOAD / UNLOAD SCRIPTS
m_ScriptEngine.m_ScriptManager.DoScriptLoadUnload(); if (m_ScriptEngine.m_ScriptManager != null)
} m_ScriptEngine.m_ScriptManager.DoScriptLoadUnload();
} }
} }
} }