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

Merge branch 'master' of opensimulator.org:/var/git/opensim

melanie
Melanie Thielker 2017-01-07 22:54:24 +00:00
parent e5244fe708 2d0860ac51
commit c9736755d8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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() == "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")
{ {
if (!perms.AllowedOwnerClasses.Contains(current)) if (!perms.AllowedOwnerClasses.Contains(current))
perms.AllowedOwnerClasses.Add(current.ToUpper()); perms.AllowedOwnerClasses.Add(current.ToUpper());
@ -426,7 +426,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
//Only active gods may use the function //Only active gods may use the function
if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GOD")) if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ACTIVE_GOD"))
{ {
ScenePresence sp = World.GetScenePresence(ownerID); ScenePresence sp = World.GetScenePresence(ownerID);
if (sp != null && !sp.IsDeleted && sp.IsGod) if (sp != null && !sp.IsDeleted && sp.IsGod)

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

@ -38,7 +38,7 @@
; 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:
; "GRID_GOD" -- enable for users with UserLevel >= 200 ; "GRID_GOD" -- enable for users with UserLevel >= 200
; "GOD" -- enable for present and with active god power ; "ACTIVE_GOD" -- enable for present and with active god power user
; "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