diff options
author | UbitUmarov | 2017-01-07 22:51:56 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-07 22:51:56 +0000 |
commit | 2d0860ac513f27885620279b83a6be2f703cc8c7 (patch) | |
tree | dd92dfc7e223081d1dcf7698b0dfa4de07fa1567 /OpenSim/Region/ScriptEngine | |
parent | change OSSL enable option GOD to use IsGod, so it means a active god, as my o... (diff) | |
download | opensim-SC_OLD-2d0860ac513f27885620279b83a6be2f703cc8c7.zip opensim-SC_OLD-2d0860ac513f27885620279b83a6be2f703cc8c7.tar.gz opensim-SC_OLD-2d0860ac513f27885620279b83a6be2f703cc8c7.tar.bz2 opensim-SC_OLD-2d0860ac513f27885620279b83a6be2f703cc8c7.tar.xz |
rename OSSL enable option GOD as ACTIVE_GOD so its use is more clear
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 07549f8..f40bf20 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -310,7 +310,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
310 | foreach (string id in ids) | 310 | foreach (string id in ids) |
311 | { | 311 | { |
312 | string current = id.Trim(); | 312 | string current = id.Trim(); |
313 | 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") | 313 | 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") |
314 | { | 314 | { |
315 | if (!perms.AllowedOwnerClasses.Contains(current)) | 315 | if (!perms.AllowedOwnerClasses.Contains(current)) |
316 | perms.AllowedOwnerClasses.Add(current.ToUpper()); | 316 | perms.AllowedOwnerClasses.Add(current.ToUpper()); |
@@ -426,7 +426,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
426 | } | 426 | } |
427 | 427 | ||
428 | //Only active gods may use the function | 428 | //Only active gods may use the function |
429 | if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GOD")) | 429 | if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ACTIVE_GOD")) |
430 | { | 430 | { |
431 | ScenePresence sp = World.GetScenePresence(ownerID); | 431 | ScenePresence sp = World.GetScenePresence(ownerID); |
432 | if (sp != null && !sp.IsDeleted && sp.IsGod) | 432 | if (sp != null && !sp.IsDeleted && sp.IsGod) |