diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-09-30 13:28:55 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-09-30 13:28:55 -0700 |
| commit | dc2dadbbe62764a2b455e8ac6657407bad9bbd6d (patch) | |
| tree | 667776f36e74485200d8ae08359f7468f9621f25 /indra/newview/llchathistory.cpp | |
| parent | c598b41c590ccd5965567f6f028747a02e597567 (diff) | |
| parent | 4ac6eed116a888e113d6f4f031e57e09a141b55a (diff) | |
Pull from sergeylproductengine/viewer-experience-fui/
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index c0c9ea1451..7a444edd43 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -42,6 +42,7 @@ #include "llavataractions.h" #include "lltrans.h" #include "llfloaterreg.h" +#include "llfloatersidepanelcontainer.h" #include "llmutelist.h" #include "llstylemap.h" #include "llslurl.h" @@ -58,8 +59,6 @@ #include "llviewercontrol.h" -#include "llsidetray.h"//for blocked objects panel - static LLDefaultChildRegistry::Register<LLChatHistory> r("chat_history"); const static std::string NEW_LINE(rawstr_to_utf8("\n")); @@ -144,7 +143,7 @@ public: { LLMuteList::getInstance()->add(LLMute(getAvatarId(), mFrom, LLMute::OBJECT)); - LLSideTray::getInstance()->showPanel("panel_block_list_sidetray", LLSD().with("blocked_to_select", getAvatarId())); + LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD().with("blocked_to_select", getAvatarId())); } } |