diff options
| author | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 17:17:42 +0000 |
|---|---|---|
| committer | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 17:17:42 +0000 |
| commit | e1e1212daae33723e7da325f295a5c3a6bb78979 (patch) | |
| tree | 95139904e71995519db2fc6e056940b2f40e73a3 /indra/newview/llpanelgrouproles.cpp | |
| parent | 41927004751731d2d0cb74989ded36878292ee4e (diff) | |
QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llpanelgrouproles.cpp')
| -rw-r--r-- | indra/newview/llpanelgrouproles.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index c04b1b72cd..5f11c4ac80 100644 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -61,6 +61,9 @@ bool agentCanRemoveFromRole(const LLUUID& group_id, bool agentCanAddToRole(const LLUUID& group_id, const LLUUID& role_id) { + if (gAgent.isGodlike()) + return true; + LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(group_id); if (!gdatap) { @@ -177,9 +180,6 @@ BOOL LLPanelGroupRoles::postBuild() BOOL LLPanelGroupRoles::isVisibleByAgent(LLAgent* agentp) { - if (agentp->isGodlike()) - return TRUE; - /* This power was removed to make group roles simpler return agentp->hasPowerInGroup(mGroupID, GP_ROLE_CREATE | @@ -1131,6 +1131,9 @@ void LLPanelGroupMembersSubTab::handleMemberSelect() } mAssignedRolesList->setEnabled(TRUE); + if (gAgent.isGodlike()) + can_eject_members = TRUE; + if (!can_eject_members && !member_is_owner) { // Maybe we can eject them because we are an owner... |