OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Flotsam cache so it will use the disk cache if the memory cache is enabled

bulletsim
Robert Adams 2011-08-01 23:14:20 -07:00 committed by Justin Clark-Casey (justincc)
parent c122489e09
commit 74b23210a7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
View File

@ -419,7 +419,7 @@ namespace Flotsam.RegionModules.AssetCache
if (m_MemoryCacheEnabled)
asset = GetFromMemoryCache(id);
else if (m_FileCacheEnabled)
if (asset == null && m_FileCacheEnabled)
asset = GetFromFileCache(id);
if (((m_LogLevel >= 1)) && (m_HitRateDisplay != 0) && (m_Requests % m_HitRateDisplay == 0))
@ -938,4 +938,4 @@ namespace Flotsam.RegionModules.AssetCache
#endregion
}
}
}