diff options
| author | UbitUmarov | 2012-10-30 19:42:32 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-10-30 19:42:32 +0000 |
| commit | e6c8eca504a4cc0daace04ad51c2cb65b3904591 (patch) | |
| tree | 7966cbf850ac084e3c1d1ab7b3e788a75844bbe7 /OpenSim/Region/ScriptEngine | |
| parent | revert last change (diff) | |
| parent | Set the script state to new rez when a scriptis saved, rather than region start. (diff) | |
| download | opensim-SC-e6c8eca504a4cc0daace04ad51c2cb65b3904591.zip opensim-SC-e6c8eca504a4cc0daace04ad51c2cb65b3904591.tar.gz opensim-SC-e6c8eca504a4cc0daace04ad51c2cb65b3904591.tar.bz2 opensim-SC-e6c8eca504a4cc0daace04ad51c2cb65b3904591.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -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 adef0e6..82de06f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -3795,6 +3795,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3795 | if (World.GetExtraSetting("auto_grant_attach_perms") == "true") | 3795 | if (World.GetExtraSetting("auto_grant_attach_perms") == "true") |
| 3796 | implicitPerms = ScriptBaseClass.PERMISSION_ATTACH; | 3796 | implicitPerms = ScriptBaseClass.PERMISSION_ATTACH; |
| 3797 | } | 3797 | } |
| 3798 | if (World.GetExtraSetting("auto_grant_all_perms") == "true") | ||
| 3799 | { | ||
| 3800 | implicitPerms = perm; | ||
| 3801 | } | ||
| 3798 | } | 3802 | } |
| 3799 | 3803 | ||
| 3800 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms | 3804 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms |