aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2009-09-02 16:29:50 +0100
committerMelanie2009-09-02 16:29:50 +0100
commit8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95 (patch)
treeaa5824b7839df1471077b276bf0cb89c13369805 /bin
parentCorrect the icons on wearables in agent inventory. To fully correct the issue (diff)
parentswitching LandManagementModule to "new" region module scheme; cleaning (diff)
downloadopensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.zip
opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.gz
opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.bz2
opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example2
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 4cf5a8d..ff1a773 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1375,6 +1375,8 @@
1375 1375
1376[J2KDecoder] 1376[J2KDecoder]
1377;CacheDir = "./j2kDecodeCache" 1377;CacheDir = "./j2kDecodeCache"
1378; Time in minutes before cached decodes expire. Set to 0 for no expiration. Default is 720 minutes.
1379
1378;CacheTimeout = 720 1380;CacheTimeout = 720
1379 1381
1380;; 1382;;