diff options
| author | Don Kjer <don@lindenlab.com> | 2008-05-19 17:02:33 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2008-05-19 17:02:33 +0000 |
| commit | 38558960978a0741dd9c79c4c7a108b8a1f99eff (patch) | |
| tree | b7221183a7c91c1097a78cf5875197431852b0b8 /indra/newview/llpanelgrouproles.cpp | |
| parent | e77de5d685ae441f72920f0e04d9887ee958745a (diff) | |
EFFECTIVE MERGES:
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
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... |