diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-25 09:34:06 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-25 09:34:06 -0400 |
| commit | 7c08ddb3f748d2173948335fd799879e3d58d81c (patch) | |
| tree | 1f72cc9ec78d7b8c4bad57f4ef14c12a04b7a3a0 /indra/newview/llpanelblockedlist.cpp | |
| parent | 1f172281453171175dea76fc469a358e1e932b60 (diff) | |
| parent | 444bdef6d4949b6381b8706ab056588bc6bd88eb (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelblockedlist.cpp')
| -rw-r--r-- | indra/newview/llpanelblockedlist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelblockedlist.cpp b/indra/newview/llpanelblockedlist.cpp index 81e199d85b..5c85ec438c 100644 --- a/indra/newview/llpanelblockedlist.cpp +++ b/indra/newview/llpanelblockedlist.cpp @@ -37,7 +37,7 @@ // project include #include "llfloateravatarpicker.h" -#include "llsidetray.h" +#include "llfloatersidepanelcontainer.h" #include "llsidetraypanelcontainer.h" static LLRegisterPanelClassWrapper<LLPanelBlockedList> t_panel_blocked_list("panel_block_list_sidetray"); @@ -99,7 +99,7 @@ void LLPanelBlockedList::selectBlocked(const LLUUID& mute_id) void LLPanelBlockedList::showPanelAndSelect(const LLUUID& idToSelect) { - LLSideTray::getInstance()->showPanel("panel_block_list_sidetray", LLSD().with(BLOCKED_PARAM_NAME, idToSelect)); + LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD().with(BLOCKED_PARAM_NAME, idToSelect)); } |