diff options
| author | Melanie | 2012-01-06 17:38:53 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-06 17:38:53 +0000 |
| commit | 81cf774fe8bbba7968c46d50e39e8f09b6e9da56 (patch) | |
| tree | 9e719fd00201bed44f85da1da8b7b69d7ccf0868 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Fix up asset stuff (diff) | |
| parent | Add ThreatLevel.NoAccess to OSSL. This allows to enable OSSL without enabling (diff) | |
| download | opensim-SC_OLD-81cf774fe8bbba7968c46d50e39e8f09b6e9da56.zip opensim-SC_OLD-81cf774fe8bbba7968c46d50e39e8f09b6e9da56.tar.gz opensim-SC_OLD-81cf774fe8bbba7968c46d50e39e8f09b6e9da56.tar.bz2 opensim-SC_OLD-81cf774fe8bbba7968c46d50e39e8f09b6e9da56.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 221a513..a49feb0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -42,6 +42,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 42 | { | 42 | { |
| 43 | public enum ThreatLevel | 43 | public enum ThreatLevel |
| 44 | { | 44 | { |
| 45 | NoAccess = -1, | ||
| 45 | None = 0, | 46 | None = 0, |
| 46 | Nuisance = 1, | 47 | Nuisance = 1, |
| 47 | VeryLow = 2, | 48 | VeryLow = 2, |