aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-09 12:19:11 -0800
committerJohn Hurliman2010-03-09 12:19:11 -0800
commit4b8af2e1aa794ee51ae6b6751eeed3e8b2b47664 (patch)
tree468a94ac8fbd5e660312917bd95e24912f4f4b83 /bin
parent* Typo fixes (diff)
parentMSSQL tweaks for latest ROBUST - friends handling fixed, GridUserData placeho... (diff)
downloadopensim-SC_OLD-4b8af2e1aa794ee51ae6b6751eeed3e8b2b47664.zip
opensim-SC_OLD-4b8af2e1aa794ee51ae6b6751eeed3e8b2b47664.tar.gz
opensim-SC_OLD-4b8af2e1aa794ee51ae6b6751eeed3e8b2b47664.tar.bz2
opensim-SC_OLD-4b8af2e1aa794ee51ae6b6751eeed3e8b2b47664.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-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 309ce88..74100f5 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