diff options
| author | diva | 2009-06-10 16:48:26 +0000 |
|---|---|---|
| committer | diva | 2009-06-10 16:48:26 +0000 |
| commit | 6242b01ac8ddd78ae47b609b42b55acc5bf4d8ea (patch) | |
| tree | e07b1d6563012a7ad1bfc25acbd52388d6f401ff | |
| parent | Added some defaults to OpenSim.ini.example so that it works out of the box ag... (diff) | |
| download | opensim-SC-6242b01ac8ddd78ae47b609b42b55acc5bf4d8ea.zip opensim-SC-6242b01ac8ddd78ae47b609b42b55acc5bf4d8ea.tar.gz opensim-SC-6242b01ac8ddd78ae47b609b42b55acc5bf4d8ea.tar.bz2 opensim-SC-6242b01ac8ddd78ae47b609b42b55acc5bf4d8ea.tar.xz | |
Removing the default reading of AssetCaching on all cache modules.
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs index d3947a2..0ae206d 100644 --- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs | |||
| @@ -60,7 +60,7 @@ namespace OpenSim.Region.CoreModules.Asset | |||
| 60 | 60 | ||
| 61 | if (moduleConfig != null) | 61 | if (moduleConfig != null) |
| 62 | { | 62 | { |
| 63 | string name = moduleConfig.GetString("AssetCaching", "CoreAssetCache"); | 63 | string name = moduleConfig.GetString("AssetCaching"); |
| 64 | m_log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name); | 64 | m_log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name); |
| 65 | 65 | ||
| 66 | if (name == Name) | 66 | if (name == Name) |
diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs index 3fc564d..d3a5006 100644 --- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs | |||
| @@ -62,7 +62,7 @@ namespace OpenSim.Region.CoreModules.Asset | |||
| 62 | 62 | ||
| 63 | if (moduleConfig != null) | 63 | if (moduleConfig != null) |
| 64 | { | 64 | { |
| 65 | string name = moduleConfig.GetString("AssetCaching", "GlynnTuckerAssetCache"); | 65 | string name = moduleConfig.GetString("AssetCaching"); |
| 66 | m_log.DebugFormat("[ASSET CACHE] name = {0} (this module's name: {1}). Sync? ", name, Name, m_Cache.IsSynchronized); | 66 | m_log.DebugFormat("[ASSET CACHE] name = {0} (this module's name: {1}). Sync? ", name, Name, m_Cache.IsSynchronized); |
| 67 | 67 | ||
| 68 | if (name == Name) | 68 | if (name == Name) |