From 74b23210a7780b2b1e3cb4a7ccf562fe2a8ec25e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 1 Aug 2011 23:14:20 -0700
Subject: Fix Flotsam cache so it will use the disk cache if the memory cache
 is enabled

---
 OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Asset')

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
 
             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
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1