aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-10-14 17:31:29 +0200
committerMelanie2012-10-14 17:31:29 +0200
commitce26730d4eb2e94ddb13aaa5203fef158f5ab5d9 (patch)
treea458cd5ebde82a52fbe2e16570a9615f29673c49 /OpenSim
parentMake texture sedning use only two threads to make things less harsh on bandwidth (diff)
downloadopensim-SC-ce26730d4eb2e94ddb13aaa5203fef158f5ab5d9.zip
opensim-SC-ce26730d4eb2e94ddb13aaa5203fef158f5ab5d9.tar.gz
opensim-SC-ce26730d4eb2e94ddb13aaa5203fef158f5ab5d9.tar.bz2
opensim-SC-ce26730d4eb2e94ddb13aaa5203fef158f5ab5d9.tar.xz
Allow bypassing perms dialog (console only)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
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