aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordiva2009-05-27 16:11:23 +0000
committerdiva2009-05-27 16:11:23 +0000
commite0ef6974022c035f5fe256f9b9d4f2815ffa300f (patch)
tree13b1035c9fde53d1b780a740239da54aa4aed4ab
parentUpdate svn properties. (diff)
downloadopensim-SC_OLD-e0ef6974022c035f5fe256f9b9d4f2815ffa300f.zip
opensim-SC_OLD-e0ef6974022c035f5fe256f9b9d4f2815ffa300f.tar.gz
opensim-SC_OLD-e0ef6974022c035f5fe256f9b9d4f2815ffa300f.tar.bz2
opensim-SC_OLD-e0ef6974022c035f5fe256f9b9d4f2815ffa300f.tar.xz
Adding the GlynnTucker cache module as the default choice in .ini's.
Minor log message change in the module itself.
-rw-r--r--OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs2
-rw-r--r--bin/config-include/GridCommon.ini.example5
-rw-r--r--bin/config-include/StandaloneCommon.ini.example5
3 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
index df65226..f784c1b 100644
--- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.CoreModules.Asset
60 if (moduleConfig != null) 60 if (moduleConfig != null)
61 { 61 {
62 string name = moduleConfig.GetString("AssetCaching", "GlynnTuckerAssetCache"); 62 string name = moduleConfig.GetString("AssetCaching", "GlynnTuckerAssetCache");
63 m_log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name); 63 m_log.DebugFormat("[ASSET CACHE] name = {0} (this module's name: {1}). Sync? ", name, Name, m_Cache.IsSynchronized);
64 64
65 if (name == Name) 65 if (name == Name)
66 { 66 {
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index de57c98..8a95776 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,9 +1,10 @@
1[Modules] 1[Modules]
2 AssetCaching = "CoreAssetCache" 2 ;AssetCaching = "CoreAssetCache"
3 AssetCaching = "GlynnTuckerAssetCache"
3 4
4[AssetCache] 5[AssetCache]
5 ; Number of buckets for assets 6 ; Number of buckets for assets
6 CacheBuckets = 32768 7 ;CacheBuckets = 32768
7 8
8[AssetService] 9[AssetService]
9 10
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 001b3a0..d607092 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,9 +1,10 @@
1[Modules] 1[Modules]
2 AssetCaching = "CoreAssetCache" 2 ;AssetCaching = "CoreAssetCache"
3 AssetCaching = "GlynnTuckerAssetCache"
3 4
4[AssetCache] 5[AssetCache]
5 ; Number of buckets for assets 6 ; Number of buckets for assets
6 CacheBuckets = 16384 7 ;CacheBuckets = 16384
7 8
8[AssetService] 9[AssetService]
9 ; 10 ;