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/Region/CoreModules/Asset | |
| 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 'OpenSim/Region/CoreModules/Asset')
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 53b8ebc..49b459a 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
| @@ -160,7 +160,10 @@ namespace Flotsam.RegionModules.AssetCache | |||
| 160 | m_CachCleanTimer.AutoReset = true; | 160 | m_CachCleanTimer.AutoReset = true; |
| 161 | m_CachCleanTimer.Elapsed += CleanupExpiredFiles; | 161 | m_CachCleanTimer.Elapsed += CleanupExpiredFiles; |
| 162 | m_CachCleanTimer.Enabled = true; | 162 | m_CachCleanTimer.Enabled = true; |
| 163 | m_CachCleanTimer.Start(); | 163 | lock (m_CachCleanTimer) |
| 164 | { | ||
| 165 | m_CachCleanTimer.Start(); | ||
| 166 | } | ||
| 164 | } | 167 | } |
| 165 | else | 168 | else |
| 166 | { | 169 | { |