diff options
| author | UbitUmarov | 2016-09-03 07:51:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-09-03 07:51:53 +0100 |
| commit | 9aec227767cf726216514d0494f11b5d8bf5b807 (patch) | |
| tree | 8f308f4c1eefa19954fc30a560ac780f8a8e916a /OpenSim/Addons | |
| parent | merge issue (diff) | |
| parent | tests making sure evering thing is coerently wrong.. (diff) | |
| download | opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.zip opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.gz opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.bz2 opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Addons/Groups/Service/GroupsService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs index 07641ef..ae0518c 100644 --- a/OpenSim/Addons/Groups/Service/GroupsService.cs +++ b/OpenSim/Addons/Groups/Service/GroupsService.cs | |||
| @@ -486,7 +486,7 @@ namespace OpenSim.Groups | |||
| 486 | // check permissions | 486 | // check permissions |
| 487 | bool limited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMemberLimited); | 487 | bool limited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMemberLimited); |
| 488 | bool unlimited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMember) | IsOwner(RequestingAgentID, GroupID); | 488 | bool unlimited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMember) | IsOwner(RequestingAgentID, GroupID); |
| 489 | if (!limited || !unlimited) | 489 | if (!limited && !unlimited) |
| 490 | { | 490 | { |
| 491 | m_log.DebugFormat("[Groups]: ({0}) Attempt at assigning {1} to role {2} denied because of lack of permission", RequestingAgentID, AgentID, RoleID); | 491 | m_log.DebugFormat("[Groups]: ({0}) Attempt at assigning {1} to role {2} denied because of lack of permission", RequestingAgentID, AgentID, RoleID); |
| 492 | return false; | 492 | return false; |