diff options
| author | Melinda Green <melinda@lindenlab.com> | 2008-12-15 21:21:19 +0000 |
|---|---|---|
| committer | Melinda Green <melinda@lindenlab.com> | 2008-12-15 21:21:19 +0000 |
| commit | e1d8dac25a93db837c780428a23f81cbf9109270 (patch) | |
| tree | a0bcaec0cec1ba6b3ce813764650eada61fcde4f /indra/newview/llpanelgrouproles.cpp | |
| parent | 9c0dbb123376608e464fcd8d1a2e288e01d78a3f (diff) | |
svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4
Diffstat (limited to 'indra/newview/llpanelgrouproles.cpp')
| -rw-r--r-- | indra/newview/llpanelgrouproles.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index ba4153b087..4b48fb3510 100644 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -2085,8 +2085,19 @@ void LLPanelGroupRolesSubTab::handleRoleSelect() gAgent.hasPowerInGroup(mGroupID, GP_ROLE_PROPERTIES)); mRoleTitle->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_ROLE_PROPERTIES)); mRoleDescription->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_ROLE_PROPERTIES)); - mMemberVisibleCheck->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_ROLE_PROPERTIES)); - + + if ( is_owner_role ) + { + // you can't delete the owner role + can_delete = FALSE; + // ... or hide members with this role + mMemberVisibleCheck->setEnabled(FALSE); + } + else + { + mMemberVisibleCheck->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_ROLE_PROPERTIES)); + } + if (item->getUUID().isNull()) { // Everyone role, can't edit description or name or delete @@ -2094,8 +2105,6 @@ void LLPanelGroupRolesSubTab::handleRoleSelect() mRoleName->setEnabled(FALSE); can_delete = FALSE; } - //you can't delete the owner role - if ( is_owner_role ) can_delete = FALSE; } else { |