diff options
author | Teravus Ovares (Dan Olivares) | 2009-09-09 16:20:19 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-09-09 16:20:19 -0400 |
commit | c605509da3a690d4050c48418111d7f29f7be9b4 (patch) | |
tree | e2e76c5e521577c9be9002530d289a4b346f2907 /OpenSim/ApplicationPlugins/RemoteController | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
download | opensim-SC-c605509da3a690d4050c48418111d7f29f7be9b4.zip opensim-SC-c605509da3a690d4050c48418111d7f29f7be9b4.tar.gz opensim-SC-c605509da3a690d4050c48418111d7f29f7be9b4.tar.bz2 opensim-SC-c605509da3a690d4050c48418111d7f29f7be9b4.tar.xz |
* Lock timers when Calling Start() and Stop() when the Thread Context is murky. This affects Mono only.
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 67ba016..7e0a4ba 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -384,7 +384,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
384 | System.Timers.Timer shutdownTimer = new System.Timers.Timer(timeout); // Wait before firing | 384 | System.Timers.Timer shutdownTimer = new System.Timers.Timer(timeout); // Wait before firing |
385 | shutdownTimer.AutoReset = false; | 385 | shutdownTimer.AutoReset = false; |
386 | shutdownTimer.Elapsed += new ElapsedEventHandler(shutdownTimer_Elapsed); | 386 | shutdownTimer.Elapsed += new ElapsedEventHandler(shutdownTimer_Elapsed); |
387 | shutdownTimer.Start(); | 387 | lock (shutdownTimer) |
388 | { | ||
389 | shutdownTimer.Start(); | ||
390 | } | ||
388 | 391 | ||
389 | responseData["success"] = true; | 392 | responseData["success"] = true; |
390 | } | 393 | } |