diff options
| author | Diva Canto | 2010-02-22 09:56:33 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-02-22 09:56:33 -0800 |
| commit | de91a9e09bbb6c41eeb022540ae08952f413fb12 (patch) | |
| tree | f4a40f7999f9c55661162b2764c883f764597973 /OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |
| parent | Deleted duplicate [GridService] section. (diff) | |
| parent | Merge branch 'master' into presence-refactor (diff) | |
| download | opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.zip opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.gz opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.bz2 opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.xz | |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs')
| -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 9216e0b..967c0a1 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
| @@ -69,7 +69,7 @@ namespace Flotsam.RegionModules.AssetCache | |||
| 69 | 69 | ||
| 70 | private readonly List<char> m_InvalidChars = new List<char>(); | 70 | private readonly List<char> m_InvalidChars = new List<char>(); |
| 71 | 71 | ||
| 72 | private int m_LogLevel = 1; | 72 | private int m_LogLevel = 0; |
| 73 | private ulong m_HitRateDisplay = 1; // How often to display hit statistics, given in requests | 73 | private ulong m_HitRateDisplay = 1; // How often to display hit statistics, given in requests |
| 74 | 74 | ||
| 75 | private static ulong m_Requests; | 75 | private static ulong m_Requests; |
| @@ -156,7 +156,7 @@ namespace Flotsam.RegionModules.AssetCache | |||
| 156 | m_WaitOnInprogressTimeout = assetConfig.GetInt("WaitOnInprogressTimeout", 3000); | 156 | m_WaitOnInprogressTimeout = assetConfig.GetInt("WaitOnInprogressTimeout", 3000); |
| 157 | #endif | 157 | #endif |
| 158 | 158 | ||
| 159 | m_LogLevel = assetConfig.GetInt("LogLevel", 1); | 159 | m_LogLevel = assetConfig.GetInt("LogLevel", 0); |
| 160 | m_HitRateDisplay = (ulong)assetConfig.GetInt("HitRateDisplay", 1000); | 160 | m_HitRateDisplay = (ulong)assetConfig.GetInt("HitRateDisplay", 1000); |
| 161 | 161 | ||
| 162 | m_FileExpiration = TimeSpan.FromHours(assetConfig.GetDouble("FileCacheTimeout", m_DefaultFileExpiration)); | 162 | m_FileExpiration = TimeSpan.FromHours(assetConfig.GetDouble("FileCacheTimeout", m_DefaultFileExpiration)); |