aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.ini.example
diff options
context:
space:
mode:
authorMelanie2010-03-09 22:46:17 +0000
committerMelanie2010-03-09 22:46:17 +0000
commit40873504dcde19a3738cf4d3a4928a59b811e8f0 (patch)
tree605d2c2575e21496b05eeabd0a5755b8fa788efd /bin/OpenSim.ini.example
parent- parcel blocking, region crossing blocking, teleport blocking (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-40873504dcde19a3738cf4d3a4928a59b811e8f0.zip
opensim-SC_OLD-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.gz
opensim-SC_OLD-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.bz2
opensim-SC_OLD-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin/OpenSim.ini.example')
-rw-r--r--bin/OpenSim.ini.example4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 9adbf7c..1a6059f 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -257,6 +257,10 @@
257 ; to be enabled from the console if this is set 257 ; to be enabled from the console if this is set
258 ; StartDisabled = false 258 ; StartDisabled = false
259 259
260 ; Image decoding. Use CSJ2K for layer boundary decoding if true,
261 ; OpenJPEG if false
262 ; UseCSJ2K = true
263
260[SMTP] 264[SMTP]
261 enabled=false 265 enabled=false
262 266