diff options
| author | Melanie | 2011-06-09 02:05:04 +0100 |
|---|---|---|
| committer | Melanie | 2011-06-09 02:05:04 +0100 |
| commit | 326c46ba70cea70ddfe4aef9a6b73edff63e126a (patch) | |
| tree | 5e76347b0d77f58717d8e5e4f3b8787ff01a18d7 /bin/OpenSimDefaults.ini | |
| parent | Make the last otem in a list created with llCSV2List findable (diff) | |
| parent | Consistency fix on the last commit. (diff) | |
| download | opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.zip opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.gz opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.bz2 opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 53eac02..860e758 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1174,6 +1174,10 @@ | |||
| 1174 | ; - the third field is a number indicating how many scripts failed to compile | 1174 | ; - the third field is a number indicating how many scripts failed to compile |
| 1175 | ; - "oar error" if supplied, provides the error message from the OAR load | 1175 | ; - "oar error" if supplied, provides the error message from the OAR load |
| 1176 | channel_notify = -800 | 1176 | channel_notify = -800 |
| 1177 | ; - disallow logins while scripts are loading | ||
| 1178 | login_disable = false | ||
| 1179 | ; - send an alert as json to a service | ||
| 1180 | ; alert_uri = "http://myappserver.net/my_handler/" | ||
| 1177 | 1181 | ||
| 1178 | 1182 | ||
| 1179 | [MRM] | 1183 | [MRM] |