aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2011-08-01 23:14:20 -0700
committerJustin Clark-Casey (justincc)2011-08-02 23:44:40 +0100
commit74b23210a7780b2b1e3cb4a7ccf562fe2a8ec25e (patch)
tree1619341a354db9e79bcca5144a4e9f5290a72e33
parentPartially fix autopilot/go here (diff)
downloadopensim-SC_OLD-74b23210a7780b2b1e3cb4a7ccf562fe2a8ec25e.zip
opensim-SC_OLD-74b23210a7780b2b1e3cb4a7ccf562fe2a8ec25e.tar.gz
opensim-SC_OLD-74b23210a7780b2b1e3cb4a7ccf562fe2a8ec25e.tar.bz2
opensim-SC_OLD-74b23210a7780b2b1e3cb4a7ccf562fe2a8ec25e.tar.xz
Fix Flotsam cache so it will use the disk cache if the memory cache is enabled
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 84fe506..da39202 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -419,7 +419,7 @@ namespace Flotsam.RegionModules.AssetCache
419 419
420 if (m_MemoryCacheEnabled) 420 if (m_MemoryCacheEnabled)
421 asset = GetFromMemoryCache(id); 421 asset = GetFromMemoryCache(id);
422 else if (m_FileCacheEnabled) 422 if (asset == null && m_FileCacheEnabled)
423 asset = GetFromFileCache(id); 423 asset = GetFromFileCache(id);
424 424
425 if (((m_LogLevel >= 1)) && (m_HitRateDisplay != 0) && (m_Requests % m_HitRateDisplay == 0)) 425 if (((m_LogLevel >= 1)) && (m_HitRateDisplay != 0) && (m_Requests % m_HitRateDisplay == 0))
@@ -938,4 +938,4 @@ namespace Flotsam.RegionModules.AssetCache
938 938
939 #endregion 939 #endregion
940 } 940 }
941} \ No newline at end of file 941}