diff options
author | Justin Clark-Casey (justincc) | 2009-09-10 18:14:34 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-10 18:14:34 +0100 |
commit | 552ba5334f9d44001768400e3d4315e0f4fa5a28 (patch) | |
tree | c47d38287011840fb08e5ecbdb879952e3420312 /OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |
parent | refactor: Replace some iar item name generation in tests with helper function (diff) | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
download | opensim-SC_OLD-552ba5334f9d44001768400e3d4315e0f4fa5a28.zip opensim-SC_OLD-552ba5334f9d44001768400e3d4315e0f4fa5a28.tar.gz opensim-SC_OLD-552ba5334f9d44001768400e3d4315e0f4fa5a28.tar.bz2 opensim-SC_OLD-552ba5334f9d44001768400e3d4315e0f4fa5a28.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 10 |
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); |