aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-09-10 00:31:14 -0400
committerTeravus Ovares (Dan Olivares)2009-09-10 00:31:14 -0400
commitdc3798ddc3ad5d3d6c7de0d46cbe669919298c3b (patch)
tree6a1ea7dd75ec397e38ed169ef27412ed4ac8ddcc
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-dc3798ddc3ad5d3d6c7de0d46cbe669919298c3b.zip
opensim-SC_OLD-dc3798ddc3ad5d3d6c7de0d46cbe669919298c3b.tar.gz
opensim-SC_OLD-dc3798ddc3ad5d3d6c7de0d46cbe669919298c3b.tar.bz2
opensim-SC_OLD-dc3798ddc3ad5d3d6c7de0d46cbe669919298c3b.tar.xz
* Another Timer lock
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs5
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
167 } 167 }
168 else 168 else
169 { 169 {
170 m_CachCleanTimer.Enabled = false; 170 lock (m_CachCleanTimer)
171 {
172 m_CachCleanTimer.Enabled = false;
173 }
171 } 174 }
172 175
173 m_CacheDirectoryTiers = assetConfig.GetInt("CacheDirectoryTiers", 1); 176 m_CacheDirectoryTiers = assetConfig.GetInt("CacheDirectoryTiers", 1);