aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index c520356..d85d3df 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -160,11 +160,17 @@ 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 {
167 m_CachCleanTimer.Enabled = false; 170 lock (m_CachCleanTimer)
171 {
172 m_CachCleanTimer.Enabled = false;
173 }
168 } 174 }
169 175
170 m_CacheDirectoryTiers = assetConfig.GetInt("CacheDirectoryTiers", 1); 176 m_CacheDirectoryTiers = assetConfig.GetInt("CacheDirectoryTiers", 1);