1 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 6b0af6d..d85d3df 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -167,7 +167,10 @@ namespace Flotsam.RegionModules.AssetCache
                     }
                     else
                     {
-                        m_CachCleanTimer.Enabled = false;
+                        lock (m_CachCleanTimer)
+                        {
+                            m_CachCleanTimer.Enabled = false;
+                        }
                     }
 
                     m_CacheDirectoryTiers = assetConfig.GetInt("CacheDirectoryTiers", 1);