summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgrouproles.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanelgrouproles.cpp')
-rw-r--r--indra/newview/llpanelgrouproles.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 5f11c4ac80..c04b1b72cd 100644
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -61,9 +61,6 @@ 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)
{
@@ -180,6 +177,9 @@ 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,9 +1131,6 @@ 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...