diff options
| author | Melanie | 2012-10-17 00:13:49 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-17 00:13:49 +0100 |
| commit | 416bc19da7c9cd9b20931376bf1408820063816a (patch) | |
| tree | d1de81a29fbabe2870552473771b0b527194bef6 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix perms when linking an object. Set root part perms to the perms (diff) | |
| download | opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.zip opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.tar.gz opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.tar.bz2 opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 7cf193d..17e3de1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -3762,6 +3762,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3762 | if (World.GetExtraSetting("auto_grant_attach_perms") == "true") | 3762 | if (World.GetExtraSetting("auto_grant_attach_perms") == "true") |
| 3763 | implicitPerms = ScriptBaseClass.PERMISSION_ATTACH; | 3763 | implicitPerms = ScriptBaseClass.PERMISSION_ATTACH; |
| 3764 | } | 3764 | } |
| 3765 | if (World.GetExtraSetting("auto_grant_all_perms") == "true") | ||
| 3766 | { | ||
| 3767 | implicitPerms = perm; | ||
| 3768 | } | ||
| 3765 | } | 3769 | } |
| 3766 | 3770 | ||
| 3767 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms | 3771 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms |