From 1c4b1149e210a3240e3c8a73eb05dbf1e360cf0a Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 19 Feb 2015 14:35:44 -0500 Subject: [PATCH] Don't disable selecting friends whose friend rights are yet to be updated --- indra/newview/llfloaterfriends.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp index 481d8f31f..bd5517c4e 100644 --- a/indra/newview/llfloaterfriends.cpp +++ b/indra/newview/llfloaterfriends.cpp @@ -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)); // 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(); @@ -960,7 +962,10 @@ void LLPanelFriends::applyRightsToFriends() rights_updates.insert(std::make_pair(id, rights)); // disable these ui elements until response from server // 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); } }