diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-03-09 01:09:20 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-03-09 01:09:20 +0000 |
| commit | b36dc363061ec5bf6b092c14193198e9a5eef816 (patch) | |
| tree | b067586bd545dfa6dce9dd0b1243b9c0aa143f33 /indra/newview/llpanelgrouproles.cpp | |
| parent | 6fa974fc64b172a7324b28d40f08f2a861d87f8d (diff) | |
svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llpanelgrouproles.cpp')
| -rw-r--r-- | indra/newview/llpanelgrouproles.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index 0e295df94a..bda962ca56 100644 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -1101,7 +1101,10 @@ void LLPanelGroupMembersSubTab::handleMemberSelect() check->setCommitCallback(onRoleCheck); check->setCallbackUserData(this); check->set( count > 0 ); - check->setTentative(0 != count && selected_members.size() != count); + check->setTentative( + (0 != count) + && (selected_members.size() != + (std::vector<LLUUID>::size_type)count)); //NOTE: as of right now a user can break the group //by removing himself from a role if he is the @@ -1996,7 +1999,7 @@ void LLPanelGroupRolesSubTab::update(LLGroupChange gc) mRolesList->sortByColumn("name", TRUE); - if ( (gdatap->mRoles.size() < MAX_ROLES) + if ( (gdatap->mRoles.size() < (U32)MAX_ROLES) && gAgent.hasPowerInGroup(mGroupID, GP_ROLE_CREATE) ) { mCreateRoleButton->setEnabled(TRUE); |