diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-01-31 11:31:15 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-01-31 11:31:15 +0200 |
| commit | ac784d669b5dbd617850854d89b31e0d82738413 (patch) | |
| tree | 375d1c20af2bc298470a2428cf05ef850f471555 /indra/newview | |
| parent | f573e77981882cf0fffaa1ae6af322e72b948f5b (diff) | |
MAINT-7084 Add tally and limit values to Block list.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llblocklist.h | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelblockedlist.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml | 15 |
3 files changed, 19 insertions, 1 deletions
diff --git a/indra/newview/llblocklist.h b/indra/newview/llblocklist.h index 0f7fa41c32..96af8d898e 100644 --- a/indra/newview/llblocklist.h +++ b/indra/newview/llblocklist.h @@ -67,6 +67,8 @@ public: void sortByType(); void refresh(); + U32 getMuteListSize() { return mMuteListSize; } + private: void addNewItem(const LLMute* mute); 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() diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml index 53d0252215..4291a6859d 100644 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -90,6 +90,19 @@ top_delta="0" width="31"/> </panel> + <text + type="string" + length="1" + follows="left|top|right" + height="14" + layout="topleft" + right="-10" + top_pad="4" + left="3" + use_ellipses="true" + name="block_limit"> + [COUNT] entries in your block list, and the limit is [LIMIT]. + </text> <block_list follows="all" height="273" @@ -97,6 +110,6 @@ left="3" name="blocked" tool_tip="List of currently blocked Residents" - top="31" + top_pad="4" right="-1"/> </panel> |