diff options
| author | UbitUmarov | 2017-01-08 02:00:24 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-08 02:00:24 +0000 |
| commit | 45695ef2e335639bb88e184291f05551bc3c146c (patch) | |
| tree | 93d24a1e43a7665b94844a302726860b064833b9 /bin/config-include/osslEnable.ini | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | add the new GOD ossl option to osslEnable.ini (diff) | |
| download | opensim-SC-45695ef2e335639bb88e184291f05551bc3c146c.zip opensim-SC-45695ef2e335639bb88e184291f05551bc3c146c.tar.gz opensim-SC-45695ef2e335639bb88e184291f05551bc3c146c.tar.bz2 opensim-SC-45695ef2e335639bb88e184291f05551bc3c146c.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | bin/config-include/osslEnable.ini | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini index b96688b..45eddf7 100644 --- a/bin/config-include/osslEnable.ini +++ b/bin/config-include/osslEnable.ini | |||
| @@ -38,7 +38,8 @@ | |||
| 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 users with any type of god rights | 41 | ; "GOD" -- enable for users with rights to be god (local or grid) |
| 42 | ; "ACTIVE_GOD" -- enable for users that are present and with active god power | ||
| 42 | ; "ESTATE_MANAGER" -- enable for estate manager | 43 | ; "ESTATE_MANAGER" -- enable for estate manager |
| 43 | ; "ESTATE_OWNER" -- enable for estate owner | 44 | ; "ESTATE_OWNER" -- enable for estate owner |
| 44 | ; "PARCEL_OWNER" -- enable for parcel owner | 45 | ; "PARCEL_OWNER" -- enable for parcel owner |