Merge branch 'avination' into careminster

This commit is contained in:
Melanie
2012-10-17 00:13:49 +01:00
7 changed files with 45 additions and 18 deletions

View File

@@ -3762,6 +3762,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (World.GetExtraSetting("auto_grant_attach_perms") == "true")
implicitPerms = ScriptBaseClass.PERMISSION_ATTACH;
}
if (World.GetExtraSetting("auto_grant_all_perms") == "true")
{
implicitPerms = perm;
}
}
if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms