diff options
| author | Diva Canto | 2011-05-28 13:52:27 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-05-28 13:52:27 -0700 |
| commit | 5cb7d8bc71da1b7da001d8586dff1235113d6aa3 (patch) | |
| tree | 9242955829557462f16bcc8b5144390cbd36c795 /bin | |
| parent | Fixed an issue with the response of CreateAgent over the SimulationConnector. (diff) | |
| parent | Comment the alert_uri so it remains disabled until set (diff) | |
| download | opensim-SC_OLD-5cb7d8bc71da1b7da001d8586dff1235113d6aa3.zip opensim-SC_OLD-5cb7d8bc71da1b7da001d8586dff1235113d6aa3.tar.gz opensim-SC_OLD-5cb7d8bc71da1b7da001d8586dff1235113d6aa3.tar.bz2 opensim-SC_OLD-5cb7d8bc71da1b7da001d8586dff1235113d6aa3.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 1d24201..fa5392d 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1174,7 +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 | ||
| 1177 | login_disable = false | 1178 | login_disable = false |
| 1179 | ; - send an alert as json to a service | ||
| 1180 | ; alert_uri = "http://myappserver.net/my_handler/" | ||
| 1178 | 1181 | ||
| 1179 | 1182 | ||
| 1180 | [MRM] | 1183 | [MRM] |