From 197cc3883fe5c532588f6b721d5f9d1295c24abc Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Fri, 25 Feb 2011 01:16:47 +0000
Subject: [PATCH] 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.
---
 OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 6ed48674b2..edb6710829 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -252,7 +252,7 @@ namespace Flotsam.RegionModules.AssetCache
                 }
                 else
                 {
-                    m_MemoryCache.AddOrUpdate(key, asset, Double.MaxValue);
+                    m_MemoryCache.AddOrUpdate(key, asset, m_DefaultMemoryExpiration);
                 }
             }
         }