OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2012-01-06 17:38:53 +00:00
parent db482cb7dd fbb2a7e90d
commit 81cf774fe8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -159,6 +159,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
string risk = m_ScriptEngine.Config.GetString("OSFunctionThreatLevel", "VeryLow"); string risk = m_ScriptEngine.Config.GetString("OSFunctionThreatLevel", "VeryLow");
switch (risk) switch (risk)
{ {
case "NoAccess":
m_MaxThreatLevel = ThreatLevel.NoAccess;
break;
case "None": case "None":
m_MaxThreatLevel = ThreatLevel.None; m_MaxThreatLevel = ThreatLevel.None;
break; break;
@ -2627,4 +2630,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return date.ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"); return date.ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ");
} }
} }
} }

1
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
View File

@ -42,6 +42,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
{ {
public enum ThreatLevel public enum ThreatLevel
{ {
NoAccess = -1,
None = 0, None = 0,
Nuisance = 1, Nuisance = 1,
VeryLow = 2, VeryLow = 2,