aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordiva2009-06-04 18:36:02 +0000
committerdiva2009-06-04 18:36:02 +0000
commit99f3382c9c42140b27b8d58be0bbc2a7c11db812 (patch)
tree718b71b883272683eaf5d17df60dd0381b141ef1
parentComment out unused variables / private fields to avoid compiler warnings. (diff)
downloadopensim-SC_OLD-99f3382c9c42140b27b8d58be0bbc2a7c11db812.zip
opensim-SC_OLD-99f3382c9c42140b27b8d58be0bbc2a7c11db812.tar.gz
opensim-SC_OLD-99f3382c9c42140b27b8d58be0bbc2a7c11db812.tar.bz2
opensim-SC_OLD-99f3382c9c42140b27b8d58be0bbc2a7c11db812.tar.xz
Fixed placement of optional configs for CenomeAssetCache. Thank you ImazeR.
-rw-r--r--bin/config-include/GridCommon.ini.example16
-rw-r--r--bin/config-include/StandaloneCommon.ini.example17
2 files changed, 18 insertions, 15 deletions
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 3825374..fb51c1f 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -4,9 +4,18 @@
4 ;AssetCaching = "CenomeMemoryAssetCache" 4 ;AssetCaching = "CenomeMemoryAssetCache"
5 5
6[AssetCache] 6[AssetCache]
7 ;; Optional configurations for CoreAssetCache
7 ; Number of buckets for assets 8 ; Number of buckets for assets
8 ;CacheBuckets = 32768 9 ;CacheBuckets = 32768
9 10
11 ;; Optional configurations for CenomeMemoryAssetCache
12 ; Cache size 128 MB (default: 134217728)
13 ; MaxSize = 134217728
14 ; Maximal asset count
15 ; MaxCount = 4096
16 ; Asset's expiration time (minutes)
17 ; ExpirationTime = 30
18
10[AssetService] 19[AssetService]
11 20
12 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 21 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
@@ -17,10 +26,3 @@
17 ; 26 ;
18 AssetServerURI = "http://myassetserver.com:8003" 27 AssetServerURI = "http://myassetserver.com:8003"
19 28
20 ; Optional configurations for CenomeMemoryAssetCache
21 ; Cache size 128 MB (default: 134217728)
22 ; MaxSize = 134217728
23 ; Maximal asset count
24 ; MaxCount = 4096
25 ; Asset's expiration time (minutes)
26 ; ExpirationTime = 30 \ No newline at end of file
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d772256..d03c003 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -4,9 +4,18 @@
4 ;AssetCaching = "CenomeMemoryAssetCache" 4 ;AssetCaching = "CenomeMemoryAssetCache"
5 5
6[AssetCache] 6[AssetCache]
7 ;; Optional configurations for CoreAssetCache
7 ; Number of buckets for assets 8 ; Number of buckets for assets
8 ;CacheBuckets = 16384 9 ;CacheBuckets = 16384
9 10
11 ;; Optional configurations for CenomeMemoryAssetCache
12 ; Cache size 128 MB (default: 134217728)
13 ; MaxSize = 134217728
14 ; Maximal asset count
15 ; MaxCount = 4096
16 ; Asset's expiration time (minutes)
17 ; ExpirationTime = 30
18
10[AssetService] 19[AssetService]
11 ; 20 ;
12 ;### Choose the DB 21 ;### Choose the DB
@@ -20,11 +29,3 @@
20 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 29 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
21 AssetLoaderArgs = "assets/AssetSets.xml" 30 AssetLoaderArgs = "assets/AssetSets.xml"
22 31
23
24 ; Optional configurations for CenomeMemoryAssetCache
25 ; Cache size 128 MB (default: 134217728)
26 ; MaxSize = 134217728
27 ; Maximal asset count
28 ; MaxCount = 4096
29 ; Asset's expiration time (minutes)
30 ; ExpirationTime = 30 \ No newline at end of file