diff options
author | Melanie | 2012-01-06 17:37:22 +0000 |
---|---|---|
committer | Melanie | 2012-01-06 17:37:22 +0000 |
commit | fbb2a7e90d28bb6a522b4e203e53e1c81cbf25e5 (patch) | |
tree | 7304903f1294eaf8f7bf6e6c8a9cf10bb5431cb8 /OpenSim/Region | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-fbb2a7e90d28bb6a522b4e203e53e1c81cbf25e5.zip opensim-SC-fbb2a7e90d28bb6a522b4e203e53e1c81cbf25e5.tar.gz opensim-SC-fbb2a7e90d28bb6a522b4e203e53e1c81cbf25e5.tar.bz2 opensim-SC-fbb2a7e90d28bb6a522b4e203e53e1c81cbf25e5.tar.xz |
Add ThreatLevel.NoAccess to OSSL. This allows to enable OSSL without enabling
any methods, even those without threat, automatically. It is for use with
setups wanting to allow only specific methods to specific users.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 503b5d0..bb0ba3d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -157,6 +157,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
157 | string risk = m_ScriptEngine.Config.GetString("OSFunctionThreatLevel", "VeryLow"); | 157 | string risk = m_ScriptEngine.Config.GetString("OSFunctionThreatLevel", "VeryLow"); |
158 | switch (risk) | 158 | switch (risk) |
159 | { | 159 | { |
160 | case "NoAccess": | ||
161 | m_MaxThreatLevel = ThreatLevel.NoAccess; | ||
162 | break; | ||
160 | case "None": | 163 | case "None": |
161 | m_MaxThreatLevel = ThreatLevel.None; | 164 | m_MaxThreatLevel = ThreatLevel.None; |
162 | break; | 165 | break; |
@@ -2619,4 +2622,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2619 | return date.ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"); | 2622 | return date.ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"); |
2620 | } | 2623 | } |
2621 | } | 2624 | } |
2622 | } \ No newline at end of file | 2625 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 00ca070..f5ee733 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, |