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/Implementation | |
| parent | Fix up asset stuff (diff) | |
| parent | Add ThreatLevel.NoAccess to OSSL. This allows to enable OSSL without enabling (diff) | |
| download | opensim-SC-81cf774fe8bbba7968c46d50e39e8f09b6e9da56.zip opensim-SC-81cf774fe8bbba7968c46d50e39e8f09b6e9da56.tar.gz opensim-SC-81cf774fe8bbba7968c46d50e39e8f09b6e9da56.tar.bz2 opensim-SC-81cf774fe8bbba7968c46d50e39e8f09b6e9da56.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 5 |
1 files changed, 4 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 c57684b..8cc6554 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -159,6 +159,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 159 | string risk = m_ScriptEngine.Config.GetString("OSFunctionThreatLevel", "VeryLow"); | 159 | string risk = m_ScriptEngine.Config.GetString("OSFunctionThreatLevel", "VeryLow"); |
| 160 | switch (risk) | 160 | switch (risk) |
| 161 | { | 161 | { |
| 162 | case "NoAccess": | ||
| 163 | m_MaxThreatLevel = ThreatLevel.NoAccess; | ||
| 164 | break; | ||
| 162 | case "None": | 165 | case "None": |
| 163 | m_MaxThreatLevel = ThreatLevel.None; | 166 | m_MaxThreatLevel = ThreatLevel.None; |
| 164 | break; | 167 | break; |
| @@ -2627,4 +2630,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2627 | return date.ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"); | 2630 | return date.ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"); |
| 2628 | } | 2631 | } |
| 2629 | } | 2632 | } |
| 2630 | } \ No newline at end of file | 2633 | } |