diff options
| author | Jonathan Freedman | 2010-10-05 14:17:18 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-05 14:17:18 -0400 |
| commit | 8f1acb890ac49ea004bf43065ce8d3472bb27708 (patch) | |
| tree | 07e4e5fc77f764232c958bdbf8f93f2651da1663 /OpenSim/Region/CoreModules/Asset | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.zip opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.gz opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.bz2 opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset')
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 9eaa758..6ed4867 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, DateTime.MaxValue); | 255 | m_MemoryCache.AddOrUpdate(key, asset, Double.MaxValue); |
| 256 | } | 256 | } |
| 257 | } | 257 | } |
| 258 | } | 258 | } |
| @@ -863,4 +863,4 @@ namespace Flotsam.RegionModules.AssetCache | |||
| 863 | 863 | ||
| 864 | #endregion | 864 | #endregion |
| 865 | } | 865 | } |
| 866 | } \ No newline at end of file | 866 | } |