diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2017-05-23 07:59:15 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2017-05-23 07:59:15 -0700 |
| commit | 3fda9bea31327f166dd1067f7e5c9ce251b40289 (patch) | |
| tree | d7bbf85ac5d6b15ed7d5db8b8b67a1cccbaca4f9 /indra/newview/llpanelpeople.cpp | |
| parent | 4bf1f1d618d61f0cc2ec0dd22cea7d1c5b909b8f (diff) | |
| parent | cf5865c6e2b27918b526431ccc4309bfc702534e (diff) | |
pull from gate
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
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) |