diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
-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 c1bf544..bb0f424 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Asset | |||
66 | private bool m_cleanupRunning; | 66 | private bool m_cleanupRunning; |
67 | 67 | ||
68 | private const string m_ModuleName = "FlotsamAssetCache"; | 68 | private const string m_ModuleName = "FlotsamAssetCache"; |
69 | private const string m_DefaultCacheDirectory = "./assetcache"; | 69 | private const string m_DefaultCacheDirectory = "assetcache"; |
70 | private string m_CacheDirectory = m_DefaultCacheDirectory; | 70 | private string m_CacheDirectory = m_DefaultCacheDirectory; |
71 | 71 | ||
72 | private readonly List<char> m_InvalidChars = new List<char>(); | 72 | private readonly List<char> m_InvalidChars = new List<char>(); |
@@ -159,7 +159,7 @@ namespace OpenSim.Region.CoreModules.Asset | |||
159 | else | 159 | else |
160 | { | 160 | { |
161 | m_FileCacheEnabled = assetConfig.GetBoolean("FileCacheEnabled", m_FileCacheEnabled); | 161 | m_FileCacheEnabled = assetConfig.GetBoolean("FileCacheEnabled", m_FileCacheEnabled); |
162 | m_CacheDirectory = assetConfig.GetString("CacheDirectory", m_DefaultCacheDirectory); | 162 | m_CacheDirectory = assetConfig.GetString("CacheDirectory", Path.Combine(Util.cacheDir(), m_DefaultCacheDirectory)); |
163 | 163 | ||
164 | m_MemoryCacheEnabled = assetConfig.GetBoolean("MemoryCacheEnabled", m_MemoryCacheEnabled); | 164 | m_MemoryCacheEnabled = assetConfig.GetBoolean("MemoryCacheEnabled", m_MemoryCacheEnabled); |
165 | m_MemoryExpiration = assetConfig.GetDouble("MemoryCacheTimeout", m_MemoryExpiration); | 165 | m_MemoryExpiration = assetConfig.GetDouble("MemoryCacheTimeout", m_MemoryExpiration); |