diff options
author | Justin Clark-Casey (justincc) | 2012-07-04 00:15:03 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-07-04 00:15:03 +0100 |
commit | 5691a8b860b22939e2b608d6d8400b5260b25cf3 (patch) | |
tree | ec66c323341399514ab601d66f1fa211f9db195a | |
parent | Correct spelling mistake m_BanedViewers to m_BannedViewers (diff) | |
download | opensim-SC_OLD-5691a8b860b22939e2b608d6d8400b5260b25cf3.zip opensim-SC_OLD-5691a8b860b22939e2b608d6d8400b5260b25cf3.tar.gz opensim-SC_OLD-5691a8b860b22939e2b608d6d8400b5260b25cf3.tar.bz2 opensim-SC_OLD-5691a8b860b22939e2b608d6d8400b5260b25cf3.tar.xz |
refactor: rename Watchdog.WATCHDOG_TIMEOUT_MS to DEFAULT_WATCHDOG_TIMEOUT_MS to reflect what it actually is
-rw-r--r-- | OpenSim/Framework/Watchdog.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs index 7552cd1..2b3a719 100644 --- a/OpenSim/Framework/Watchdog.cs +++ b/OpenSim/Framework/Watchdog.cs | |||
@@ -41,8 +41,8 @@ namespace OpenSim.Framework | |||
41 | /// <summary>Timer interval in milliseconds for the watchdog timer</summary> | 41 | /// <summary>Timer interval in milliseconds for the watchdog timer</summary> |
42 | const double WATCHDOG_INTERVAL_MS = 2500.0d; | 42 | const double WATCHDOG_INTERVAL_MS = 2500.0d; |
43 | 43 | ||
44 | /// <summary>Maximum timeout in milliseconds before a thread is considered dead</summary> | 44 | /// <summary>Default timeout in milliseconds before a thread is considered dead</summary> |
45 | public const int WATCHDOG_TIMEOUT_MS = 5000; | 45 | public const int DEFAULT_WATCHDOG_TIMEOUT_MS = 5000; |
46 | 46 | ||
47 | [System.Diagnostics.DebuggerDisplay("{Thread.Name}")] | 47 | [System.Diagnostics.DebuggerDisplay("{Thread.Name}")] |
48 | public class ThreadWatchdogInfo | 48 | public class ThreadWatchdogInfo |
@@ -122,7 +122,7 @@ namespace OpenSim.Framework | |||
122 | public static Thread StartThread( | 122 | public static Thread StartThread( |
123 | ThreadStart start, string name, ThreadPriority priority, bool isBackground, bool alarmIfTimeout) | 123 | ThreadStart start, string name, ThreadPriority priority, bool isBackground, bool alarmIfTimeout) |
124 | { | 124 | { |
125 | return StartThread(start, name, priority, isBackground, alarmIfTimeout, null, WATCHDOG_TIMEOUT_MS); | 125 | return StartThread(start, name, priority, isBackground, alarmIfTimeout, null, DEFAULT_WATCHDOG_TIMEOUT_MS); |
126 | } | 126 | } |
127 | 127 | ||
128 | /// <summary> | 128 | /// <summary> |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 44c65e0..468d524 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -270,7 +270,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
270 | false, | 270 | false, |
271 | true, | 271 | true, |
272 | GetWatchdogIncomingAlarmData, | 272 | GetWatchdogIncomingAlarmData, |
273 | Watchdog.WATCHDOG_TIMEOUT_MS); | 273 | Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS); |
274 | 274 | ||
275 | Watchdog.StartThread( | 275 | Watchdog.StartThread( |
276 | OutgoingPacketHandler, | 276 | OutgoingPacketHandler, |
@@ -279,7 +279,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
279 | false, | 279 | false, |
280 | true, | 280 | true, |
281 | GetWatchdogOutgoingAlarmData, | 281 | GetWatchdogOutgoingAlarmData, |
282 | Watchdog.WATCHDOG_TIMEOUT_MS); | 282 | Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS); |
283 | 283 | ||
284 | m_elapsedMSSinceLastStatReport = Environment.TickCount; | 284 | m_elapsedMSSinceLastStatReport = Environment.TickCount; |
285 | } | 285 | } |