diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-18 17:40:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-18 17:40:04 -0400 |
| commit | 53ce47fc1c2a713c6d7dd7fd9f98e50de727b974 (patch) | |
| tree | fcc220f37f0de56d63c5f501e7c577463106eb69 /indra/newview/llchathistory.cpp | |
| parent | f36cf6f1bad7e239011ab3ad40dca8002f42083c (diff) | |
| parent | 395a29717026221255d8bed57098afa52c49bff9 (diff) | |
merge changes for STORM-1654
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 913d2f34b0..42de47e777 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())); } } |