diff options
| author | BlueWall | 2011-05-28 00:39:21 -0400 |
|---|---|---|
| committer | BlueWall | 2011-05-28 00:39:21 -0400 |
| commit | d2c2a4301b5c2d12e05483a1af0ea5959b7be5ca (patch) | |
| tree | 0defa28e701d9ffaa0c4352c751d5273180d0742 /bin | |
| parent | minor: remove mono compiler warning (diff) | |
| parent | Add option to disable logins (diff) | |
| download | opensim-SC_OLD-d2c2a4301b5c2d12e05483a1af0ea5959b7be5ca.zip opensim-SC_OLD-d2c2a4301b5c2d12e05483a1af0ea5959b7be5ca.tar.gz opensim-SC_OLD-d2c2a4301b5c2d12e05483a1af0ea5959b7be5ca.tar.bz2 opensim-SC_OLD-d2c2a4301b5c2d12e05483a1af0ea5959b7be5ca.tar.xz | |
Merge branch 'master' of /home/opensim/src/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index b32d198..1d24201 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1174,6 +1174,7 @@ | |||
| 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 | login_disable = false | ||
| 1177 | 1178 | ||
| 1178 | 1179 | ||
| 1179 | [MRM] | 1180 | [MRM] |