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

Fix a compile issue and reintroduce the "GOD" script option

melanie
Melanie Thielker 2017-01-07 23:12:51 +00:00
parent c9736755d8
commit f457925f80
2 changed files with 31 additions and 22 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

@ -310,7 +310,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
foreach (string id in ids) foreach (string id in ids)
{ {
string current = id.Trim(); string current = id.Trim();
if (current.ToUpper() == "PARCEL_GROUP_MEMBER" || current.ToUpper() == "PARCEL_OWNER" || current.ToUpper() == "ESTATE_MANAGER" || current.ToUpper() == "ESTATE_OWNER" || current.ToUpper() == "ACTIVE_GOD" || current.ToUpper() == "GRID_GOD") if (current.ToUpper() == "PARCEL_GROUP_MEMBER" || current.ToUpper() == "PARCEL_OWNER" || current.ToUpper() == "ESTATE_MANAGER" || current.ToUpper() == "ESTATE_OWNER" || current.ToUpper() == "ACTIVE_GOD" || current.ToUpper() == "GRID_GOD" || current.ToUpper() == "GOD")
{ {
if (!perms.AllowedOwnerClasses.Contains(current)) if (!perms.AllowedOwnerClasses.Contains(current))
perms.AllowedOwnerClasses.Add(current.ToUpper()); perms.AllowedOwnerClasses.Add(current.ToUpper());
@ -425,6 +425,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
//Any god may use the function
if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GOD"))
{
if (World.Permissions.IsAdministrator(ownerID))
{
return String.Empty;
}
}
//Only active gods may use the function //Only active gods may use the function
if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ACTIVE_GOD")) if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ACTIVE_GOD"))
{ {

6
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -927,9 +927,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
if(e.InnerException != null && e.InnerException is ScriptException) if(e.InnerException != null && e.InnerException is ScriptException)
{ {
if (e.InnerException.Message == "Softfail") if (e.InnerException.Message != "Softfail")
return; {
string text = e.InnerException.Message + string text = e.InnerException.Message +
"(script: " + ScriptName + "(script: " + ScriptName +
" event: " + data.EventName + " event: " + data.EventName +
@ -950,6 +949,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
Part.ParentGroup.Scene.Name)); Part.ParentGroup.Scene.Name));
} }
}
else else
{ {