aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2010-01-10 04:16:06 +0000
committerMelanie2010-01-10 04:16:06 +0000
commit1676e70dfe322381495b08ac1187ae9685f94e69 (patch)
treeb0b949af491811972dd866bff09f037e335c2b2b /bin
parentMerge branch 'master' into careminster (diff)
parentFix a small bug in login disable code (diff)
downloadopensim-SC_OLD-1676e70dfe322381495b08ac1187ae9685f94e69.zip
opensim-SC_OLD-1676e70dfe322381495b08ac1187ae9685f94e69.tar.gz
opensim-SC_OLD-1676e70dfe322381495b08ac1187ae9685f94e69.tar.bz2
opensim-SC_OLD-1676e70dfe322381495b08ac1187ae9685f94e69.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 9b9fadd..43e1d50 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -268,6 +268,9 @@
268 ; Enable JSON simulator data by setting a URI name (case sensitive) 268 ; Enable JSON simulator data by setting a URI name (case sensitive)
269 ; Stats_URI = "jsonSimStats" 269 ; Stats_URI = "jsonSimStats"
270 270
271 ; Make OpenSim start all regions woth logins disabled. They will need
272 ; to be enabled from the console if this is set
273 ; StartDisabled = false
271 274
272[SMTP] 275[SMTP]
273 enabled=false 276 enabled=false