Merge with tip

1 files changed, 8 insertions, 5 deletions

diff --git a/indra/newview/llpanelblockedlist.cpp b/indra/newview/llpanelblockedlist.cpp
index 362657a458..a186bc926c 100644
--- a/indra/newview/llpanelblockedlist.cpp
+++ b/indra/newview/llpanelblockedlist.cpp
@@ -119,8 +119,13 @@ void LLPanelBlockedList::refreshBlockedList()
 	std::vector<LLMute>::iterator it;
 	for (it = mutes.begin(); it != mutes.end(); ++it)
 	{
-		std::string display_name = it->getDisplayName();
-		mBlockedList->addStringUUIDItem(display_name, it->mID, ADD_BOTTOM, TRUE);
+		LLScrollListItem::Params item_p;
+		item_p.enabled(TRUE);
+		item_p.value(it->mID); // link UUID of blocked item with ScrollListItem
+		item_p.columns.add().column("item_name").value(it->mName);//.type("text");
+		item_p.columns.add().column("item_type").value(it->getDisplayType());//.type("text").width(111);
+
+		mBlockedList->addRow(item_p, ADD_BOTTOM);
 	}
 }
 
@@ -145,9 +150,7 @@ void LLPanelBlockedList::onRemoveBtnClick()
 {
 	std::string name = mBlockedList->getSelectedItemLabel();
 	LLUUID id = mBlockedList->getStringUUIDSelectedItem();
-	LLMute mute(id);
-	mute.setFromDisplayName(name);
-	// now mute.mName has the suffix trimmed off
+	LLMute mute(id, name);
 	
 	S32 last_selected = mBlockedList->getFirstSelectedIndex();
 	if (LLMuteList::getInstance()->remove(mute))