aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-02-25 01:16:47 +0000
committerJustin Clark-Casey (justincc)2011-02-25 01:16:47 +0000
commit197cc3883fe5c532588f6b721d5f9d1295c24abc (patch)
tree599bf61fb2cb592fe088e0d31ff5c6adaae1f17e /OpenSim/Region
parentFix bug where avatars in other regions would not always show up on the mini-map (diff)
downloadopensim-SC_OLD-197cc3883fe5c532588f6b721d5f9d1295c24abc.zip
opensim-SC_OLD-197cc3883fe5c532588f6b721d5f9d1295c24abc.tar.gz
opensim-SC_OLD-197cc3883fe5c532588f6b721d5f9d1295c24abc.tar.bz2
opensim-SC_OLD-197cc3883fe5c532588f6b721d5f9d1295c24abc.tar.xz
Fix bug where having no maximum memory cache timeout would cause the flotsam asset cache to try using Double.MaxValue, which would cause the underlying OpenMetaverse.ExpiringCache to choke.
There is probably an underlying bug to fix in ExpiringCache.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 6ed4867..edb6710 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -252,7 +252,7 @@ namespace Flotsam.RegionModules.AssetCache
252 } 252 }
253 else 253 else
254 { 254 {
255 m_MemoryCache.AddOrUpdate(key, asset, Double.MaxValue); 255 m_MemoryCache.AddOrUpdate(key, asset, m_DefaultMemoryExpiration);
256 } 256 }
257 } 257 }
258 } 258 }