diff options
author | onefang | 2019-05-19 22:15:41 +1000 |
---|---|---|
committer | onefang | 2019-05-19 22:15:41 +1000 |
commit | 295e91b8f44a356ab742dedd27c1b7edfe7b1157 (patch) | |
tree | de336b1b137c27f94bd4e0a2fb63bea9b1de60e2 /OpenSim/Region/CoreModules/Asset | |
parent | Move db directory out of tree. (diff) | |
download | opensim-SC_OLD-295e91b8f44a356ab742dedd27c1b7edfe7b1157.zip opensim-SC_OLD-295e91b8f44a356ab742dedd27c1b7edfe7b1157.tar.gz opensim-SC_OLD-295e91b8f44a356ab742dedd27c1b7edfe7b1157.tar.bz2 opensim-SC_OLD-295e91b8f44a356ab742dedd27c1b7edfe7b1157.tar.xz |
Move cache, config, logs out of tree, and various related clean ups.
Diffstat (limited to '')
-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); |