summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelblockedlist.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-03-06 14:42:48 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-03-06 14:42:48 -0500
commit015463c7313f93b178c517519d71889ab897361a (patch)
tree26dab56ffa84f78bfeca57e7166ff96e565572d3 /indra/newview/llpanelblockedlist.cpp
parent09a6daabd2c4281b071f9213906872ea8a744956 (diff)
parent08ed7f676f2ce38937a03c2a4e823e3564981264 (diff)
merge
Diffstat (limited to 'indra/newview/llpanelblockedlist.cpp')
-rw-r--r--indra/newview/llpanelblockedlist.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelblockedlist.cpp b/indra/newview/llpanelblockedlist.cpp
index 81ed2963e6..25ae4774fc 100644
--- a/indra/newview/llpanelblockedlist.cpp
+++ b/indra/newview/llpanelblockedlist.cpp
@@ -141,6 +141,9 @@ void LLPanelBlockedList::updateButtons()
bool hasSelected = NULL != mBlockedList->getSelectedItem();
getChildView("unblock_btn")->setEnabled(hasSelected);
getChildView("blocked_gear_btn")->setEnabled(hasSelected);
+
+ getChild<LLUICtrl>("block_limit")->setTextArg("[COUNT]", llformat("%d", mBlockedList->getMuteListSize()));
+ getChild<LLUICtrl>("block_limit")->setTextArg("[LIMIT]", llformat("%d", gSavedSettings.getS32("MuteListLimit")));
}
void LLPanelBlockedList::unblockItem()