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

* Improve and correct messages given to the user when permission is denied for a particular OSSL function 

* I don't believe that the extra information given is anything that couldn't be worked out by trial and error
0.6.1-post-fixes
Justin Clarke Casey 2008-11-21 17:28:57 +00:00
parent ee4d4d784e
commit c2d3d8d88e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,7 +183,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void CheckThreatLevel(ThreatLevel level, string function) public void CheckThreatLevel(ThreatLevel level, string function)
{ {
if (!m_OSFunctionsEnabled) if (!m_OSFunctionsEnabled)
OSSLError(function+": permission denied"); // throws OSSLError(String.Format("{0} permission denied. All OS functions are disabled.", function)); // throws
if (!m_FunctionPerms.ContainsKey(function)) if (!m_FunctionPerms.ContainsKey(function))
{ {
@ -239,14 +239,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (m_FunctionPerms[function] == null) // No list = true if (m_FunctionPerms[function] == null) // No list = true
{ {
if (level > m_MaxThreatLevel) if (level > m_MaxThreatLevel)
throw new Exception("Threat level too high - "+function); OSSLError(
String.Format(
"{0} permission denied. Allowed threat level is {1} but function threat level is {2}.",
function, m_MaxThreatLevel, level));
} }
else else
{ {
if (!m_FunctionPerms[function].Contains(UUID.Zero)) if (!m_FunctionPerms[function].Contains(UUID.Zero))
{ {
if (!m_FunctionPerms[function].Contains(m_host.OwnerID)) if (!m_FunctionPerms[function].Contains(m_host.OwnerID))
throw new Exception("Threat level too high - "+function); OSSLError(
String.Format("{0} permission denied. Prim owner is not in the list of users allowed to execute this function.",
function));
} }
} }
} }