diff options
| author | Melanie Thielker | 2017-01-07 22:54:24 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2017-01-07 22:54:24 +0000 |
| commit | c9736755d84c6bbee863578938aa279379b83170 (patch) | |
| tree | c347212b2923686deca92e0537a458426a37c5c9 /bin | |
| parent | Allow OSSL scripts to softfail (diff) | |
| parent | rename OSSL enable option GOD as ACTIVE_GOD so its use is more clear (diff) | |
| download | opensim-SC_OLD-c9736755d84c6bbee863578938aa279379b83170.zip opensim-SC_OLD-c9736755d84c6bbee863578938aa279379b83170.tar.gz opensim-SC_OLD-c9736755d84c6bbee863578938aa279379b83170.tar.bz2 opensim-SC_OLD-c9736755d84c6bbee863578938aa279379b83170.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | bin/config-include/osslEnable.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini index 3859ba6..7bdb7b5 100644 --- a/bin/config-include/osslEnable.ini +++ b/bin/config-include/osslEnable.ini | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | ; against the owner of the object containing the script. | 38 | ; against the owner of the object containing the script. |
| 39 | ; The comma separated entries in the list may be one of: | 39 | ; The comma separated entries in the list may be one of: |
| 40 | ; "GRID_GOD" -- enable for users with UserLevel >= 200 | 40 | ; "GRID_GOD" -- enable for users with UserLevel >= 200 |
| 41 | ; "GOD" -- enable for present and with active god power | 41 | ; "ACTIVE_GOD" -- enable for present and with active god power user |
| 42 | ; "ESTATE_MANAGER" -- enable for estate manager | 42 | ; "ESTATE_MANAGER" -- enable for estate manager |
| 43 | ; "ESTATE_OWNER" -- enable for estate owner | 43 | ; "ESTATE_OWNER" -- enable for estate owner |
| 44 | ; "PARCEL_OWNER" -- enable for parcel owner | 44 | ; "PARCEL_OWNER" -- enable for parcel owner |