aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorBlueWall2012-06-12 17:07:10 -0400
committerBlueWall2012-06-12 17:15:56 -0400
commitc53c55fed02d02af419fb2968764fcefa5faac37 (patch)
tree58735efd3021dc8a7dc2f248093e8d406e0b2b7f /OpenSim/Region/Application
parentRemove accidental timeout left in during earlier debugging. Has been in sinc... (diff)
downloadopensim-SC_OLD-c53c55fed02d02af419fb2968764fcefa5faac37.zip
opensim-SC_OLD-c53c55fed02d02af419fb2968764fcefa5faac37.tar.gz
opensim-SC_OLD-c53c55fed02d02af419fb2968764fcefa5faac37.tar.bz2
opensim-SC_OLD-c53c55fed02d02af419fb2968764fcefa5faac37.tar.xz
Add variable timer configureation for the timer_Script
Added "timer_Interval" to the OpenSimDefaults.ini, leaving the default value set to 1200, as the previous default setting. The value represents seconds. To change the default, copy the entry to OpenSim.ini and multiply the number of minutes for the interval by 60.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 9c38ebe..57a3c69 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -70,6 +70,7 @@ namespace OpenSim
70 private Regex m_consolePromptRegex = new Regex(@"([^\\])\\(\w)", RegexOptions.Compiled); 70 private Regex m_consolePromptRegex = new Regex(@"([^\\])\\(\w)", RegexOptions.Compiled);
71 71
72 private string m_timedScript = "disabled"; 72 private string m_timedScript = "disabled";
73 private int m_timeInterval = 1200;
73 private Timer m_scriptTimer; 74 private Timer m_scriptTimer;
74 75
75 public OpenSim(IConfigSource configSource) : base(configSource) 76 public OpenSim(IConfigSource configSource) : base(configSource)
@@ -99,6 +100,10 @@ namespace OpenSim
99 m_consolePort = (uint)networkConfig.GetInt("console_port", 0); 100 m_consolePort = (uint)networkConfig.GetInt("console_port", 0);
100 101
101 m_timedScript = startupConfig.GetString("timer_Script", "disabled"); 102 m_timedScript = startupConfig.GetString("timer_Script", "disabled");
103 if (m_timedScript != "disabled")
104 {
105 m_timeInterval = startupConfig.GetInt("timer_Interval", 1200);
106 }
102 107
103 if (m_logFileAppender != null) 108 if (m_logFileAppender != null)
104 { 109 {
@@ -216,7 +221,7 @@ namespace OpenSim
216 { 221 {
217 m_scriptTimer = new Timer(); 222 m_scriptTimer = new Timer();
218 m_scriptTimer.Enabled = true; 223 m_scriptTimer.Enabled = true;
219 m_scriptTimer.Interval = 1200*1000; 224 m_scriptTimer.Interval = m_timeInterval*1000;
220 m_scriptTimer.Elapsed += RunAutoTimerScript; 225 m_scriptTimer.Elapsed += RunAutoTimerScript;
221 } 226 }
222 } 227 }