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

replace the (hidden) GRID_GOD by a more usefull GOD so includes all types. This needs to be changed to current effective godlevel check (sp.GodLevel) when that is fixed. Automatic god powers need be (optionaly) removed

melanie
UbitUmarov 2016-12-23 03:42:50 +00:00
parent 2e7e4427d0
commit 0887be3c12
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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() == "GRID_GOD") if (current.ToUpper() == "PARCEL_GROUP_MEMBER" || current.ToUpper() == "PARCEL_OWNER" || current.ToUpper() == "ESTATE_MANAGER" || current.ToUpper() == "ESTATE_OWNER" || current.ToUpper() == "GOD")
{ {
if (!perms.AllowedOwnerClasses.Contains(current)) if (!perms.AllowedOwnerClasses.Contains(current))
perms.AllowedOwnerClasses.Add(current.ToUpper()); perms.AllowedOwnerClasses.Add(current.ToUpper());
@ -416,9 +416,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
//Only gods may use the function //Only gods may use the function
if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GRID_GOD")) if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GOD"))
{ {
if (World.Permissions.IsGridGod(ownerID)) // this should be replaced by sp.GodLevel > 200 to be effective requested power
// but that still needs fix
if (World.Permissions.IsGod(ownerID))
{ {
return String.Empty; return String.Empty;
} }

1
bin/config-include/osslEnable.ini
View File

@ -37,6 +37,7 @@
; To enable for individuals or groups, set it to a comma separated list. This checks ; To enable for individuals or groups, set it to a comma separated list. This checks
; against the owner of the object containing the script. ; against the owner of the object containing the script.
; The comma separated entries in the list may be one of: ; The comma separated entries in the list may be one of:
; "GOD" -- enable for users with GOD rights
; "ESTATE_MANAGER" -- enable for estate manager ; "ESTATE_MANAGER" -- enable for estate manager
; "ESTATE_OWNER" -- enable for estate owner ; "ESTATE_OWNER" -- enable for estate owner
; "PARCEL_OWNER" -- enable for parcel owner ; "PARCEL_OWNER" -- enable for parcel owner