Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't disable selecting friends whose friend rights are yet to be updated

Browse Source
This commit is contained in:
Inusaito Sayori
2015-02-19 14:35:44 -05:00
parent 728434e8ef
commit fa83ad8008
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llfloaterfriends.cpp
View File

@@ -460,7 +460,9 @@ void LLPanelFriends::updateFriendItem(const LLUUID& agent_id, const LLRelationsh
itemp->getColumn(LIST_EDIT_THEIRS)->setValue(info->isRightGrantedFrom(LLRelationship::GRANT_MODIFY_OBJECTS)); itemp->getColumn(LIST_EDIT_THEIRS)->setValue(info->isRightGrantedFrom(LLRelationship::GRANT_MODIFY_OBJECTS));
// enable this item, in case it was disabled after user input // enable this item, in case it was disabled after user input
itemp->setEnabled(true); itemp->getColumn(LIST_VISIBLE_ONLINE)->setEnabled(true);
itemp->getColumn(LIST_VISIBLE_MAP)->setEnabled(true);
itemp->getColumn(LIST_EDIT_MINE)->setEnabled(true);
mFriendsList->setNeedsSort(); mFriendsList->setNeedsSort();
@@ -960,7 +962,10 @@ void LLPanelFriends::applyRightsToFriends()
rights_updates.insert(std::make_pair(id, rights)); rights_updates.insert(std::make_pair(id, rights));
// disable these ui elements until response from server // disable these ui elements until response from server
// to avoid race conditions // to avoid race conditions
(*itr)->setEnabled(false); LLScrollListItem& item = *(*itr);
item.getColumn(LIST_VISIBLE_ONLINE)->setEnabled(false);
item.getColumn(LIST_VISIBLE_MAP)->setEnabled(false);
item.getColumn(LIST_EDIT_MINE)->setEnabled(false);
} }
} }