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/Rest/Inventory/RestInventoryServices.cs | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
download | opensim-SC_OLD-c605509da3a690d4050c48418111d7f29f7be9b4.zip opensim-SC_OLD-c605509da3a690d4050c48418111d7f29f7be9b4.tar.gz opensim-SC_OLD-c605509da3a690d4050c48418111d7f29f7be9b4.tar.bz2 opensim-SC_OLD-c605509da3a690d4050c48418111d7f29f7be9b4.tar.xz |
* Lock timers when Calling Start() and Stop() when the Thread Context is murky. This affects Mono only.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index 59431bb..4e03e67 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
@@ -2177,13 +2177,16 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
2177 | watchDog.Interval = interval; | 2177 | watchDog.Interval = interval; |
2178 | watchDog.AutoReset = false; | 2178 | watchDog.AutoReset = false; |
2179 | watchDog.Enabled = true; | 2179 | watchDog.Enabled = true; |
2180 | watchDog.Start(); | 2180 | lock (watchDog) |
2181 | watchDog.Start(); | ||
2182 | |||
2181 | } | 2183 | } |
2182 | 2184 | ||
2183 | internal void stopWD() | 2185 | internal void stopWD() |
2184 | { | 2186 | { |
2185 | Rest.Log.DebugFormat("{0} Reset watchdog", MsgId); | 2187 | Rest.Log.DebugFormat("{0} Reset watchdog", MsgId); |
2186 | watchDog.Stop(); | 2188 | lock (watchDog) |
2189 | watchDog.Stop(); | ||
2187 | } | 2190 | } |
2188 | 2191 | ||
2189 | /// <summary> | 2192 | /// <summary> |