diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-04-25 17:37:46 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-04-25 17:37:46 +0300 |
| commit | 5dd4a2847289d94ff65aa27f0f24e963cede636b (patch) | |
| tree | b6505db4745ac399ba737e6c418da9c890335e9a /indra/newview | |
| parent | 5b5ee18f6fb1bb6c5ef8590f933014069c5613a9 (diff) | |
MAINT-7349 FIXED An item is not highlighted in Block panel after blocking it
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelblockedlist.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llpanelblockedlist.cpp b/indra/newview/llpanelblockedlist.cpp index 25ae4774fc..3322e8a3df 100644 --- a/indra/newview/llpanelblockedlist.cpp +++ b/indra/newview/llpanelblockedlist.cpp @@ -123,6 +123,7 @@ void LLPanelBlockedList::onOpen(const LLSD& key) void LLPanelBlockedList::selectBlocked(const LLUUID& mute_id) { + mBlockedList->resetSelection(); mBlockedList->selectItemByUUID(mute_id); } diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index bc177abc57..eb2a297a35 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -1465,7 +1465,17 @@ void LLPanelPeople::onOpen(const LLSD& key) { std::string tab_name = key["people_panel_tab_name"]; if (!tab_name.empty()) + { mTabContainer->selectTabByName(tab_name); + if(tab_name == BLOCKED_TAB_NAME) + { + LLPanel* blocked_tab = mTabContainer->getCurrentPanel()->findChild<LLPanel>("panel_block_list_sidetray"); + if(blocked_tab) + { + blocked_tab->onOpen(key); + } + } + } } bool LLPanelPeople::notifyChildren(const LLSD& info) |