Merge branch 'master' of /home/opensim/src/opensim

This commit is contained in:
BlueWall
2011-05-28 16:21:30 -04:00
4 changed files with 106 additions and 11 deletions

View File

@@ -1174,7 +1174,10 @@
; - the third field is a number indicating how many scripts failed to compile
; - "oar error" if supplied, provides the error message from the OAR load
channel_notify = -800
; - disallow logins while scripts are loading
login_disable = false
; - send an alert as json to a service
alert_uri = "http://myappserver.net/my_handler/"
[MRM]