Merge branch 'master' into careminster

2012-01-06 17:38:53 +00:00 · 2012-01-06 17:38:53 +00:00 · 81cf774fe8
parent db482cb7dd fbb2a7e90d
commit 81cf774fe8
2 changed files with 5 additions and 1 deletions
--- 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
            string risk = m_ScriptEngine.Config.GetString("OSFunctionThreatLevel", "VeryLow");
            switch (risk)
            {
+            case "NoAccess":
+                m_MaxThreatLevel = ThreatLevel.NoAccess;
+                break;
            case "None":
                m_MaxThreatLevel = ThreatLevel.None;
                break;
--- 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
 {
    public enum ThreatLevel
    {
+        NoAccess = -1,
        None = 0,
        Nuisance = 1,
        VeryLow = 2,