summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llpanelblockedlist.cpp1
-rw-r--r--indra/newview/llpanelpeople.cpp10
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)