livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-17440: Right-clicking an entry in the mutelist that is muted by name always selects the first mute by name

master
Ansariel 2015-12-07 10:53:41 +01:00
parent e663a4d2ba
commit f11c97a357
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/fspanelblocklist.cpp
View File

@ -118,7 +118,17 @@ void FSPanelBlockList::onOpen(const LLSD& key)
void FSPanelBlockList::selectBlocked(const LLUUID& mute_id)
{
mBlockedList->selectByID(mute_id);
mBlockedList->deselectAllItems();
std::vector<LLScrollListItem*> items = mBlockedList->getAllData();
for (std::vector<LLScrollListItem*>::iterator it = items.begin(); it != items.end(); it++)
{
if ((*it)->getColumn(3)->getValue().asUUID() == mute_id)
{
(*it)->setSelected(TRUE);
break;
}
}
mBlockedList->scrollToShowSelected();
}
@ -154,10 +164,11 @@ void FSPanelBlockList::refreshBlockedList()
{
LLScrollListItem::Params item_p;
item_p.enabled(TRUE);
item_p.value(it->mID); // link UUID of blocked item with ScrollListItem
item_p.value(LLUUID::generateNewID()); // can't link UUID of blocked item directly because of mutes by name
item_p.columns.add().column("item_name").value(it->mName);
item_p.columns.add().column("item_type").value(it->getDisplayType());
item_p.columns.add().column("item_mute_type").value(it->mType);
item_p.columns.add().column("item_mute_uuid").value(it->mID);
mBlockedList->addRow(item_p, ADD_BOTTOM);
}
@ -184,7 +195,7 @@ void FSPanelBlockList::removeMutes()
for (std::vector<LLScrollListItem*>::iterator it = selected_items.begin(); it != selected_items.end(); it++)
{
std::string name = (*it)->getColumn(0)->getValue().asString();
LLUUID id = (*it)->getUUID();
LLUUID id = (*it)->getColumn(3)->getValue().asUUID();
LLMute mute(id, name);
LLMuteList::getInstance()->remove(mute);
}
@ -325,7 +336,7 @@ void FSPanelBlockList::showProfile()
if (mBlockedList->getNumSelected() == 1 &&
(LLMute::EType)mBlockedList->getFirstSelected()->getColumn(2)->getValue().asInteger() == LLMute::AGENT)
{
LLAvatarActions::showProfile(mBlockedList->getValue());
LLAvatarActions::showProfile(mBlockedList->getFirstSelected()->getColumn(3)->getValue().asUUID());
}
}

3
indra/newview/skins/default/xui/en/panel_fs_block_list_sidetray.xml
View File

@ -111,5 +111,8 @@
<fs_scroll_list.columns
name="item_mute_type"
width="-1" />
<fs_scroll_list.columns
name="item_mute_uuid"
width="-1" />
</fs_scroll_list>
</panel>

3
indra/newview/skins/vintage/xui/en/panel_fs_block_list_sidetray.xml
View File

@ -30,6 +30,9 @@
<fs_scroll_list.columns
name="item_mute_type"
width="-1" />
<fs_scroll_list.columns
name="item_mute_uuid"
width="-1" />
</fs_scroll_list>
<layout_stack