Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

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
                         m_CachCleanTimer.AutoReset = true;
                         m_CachCleanTimer.Elapsed += CleanupExpiredFiles;
                         m_CachCleanTimer.Enabled = true;
-                        m_CachCleanTimer.Start();
+                        lock (m_CachCleanTimer)
+                        {
+                            m_CachCleanTimer.Start();
+                        }
                     }
                     else
                     {
-                        m_CachCleanTimer.Enabled = false;
+                        lock (m_CachCleanTimer)
+                        {
+                            m_CachCleanTimer.Enabled = false;
+                        }
                     }
 
                     m_CacheDirectoryTiers = assetConfig.GetInt("CacheDirectoryTiers", 1);