diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-28 17:14:50 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-28 17:14:50 +0300 |
| commit | c44db34a15abd2e96b8fd461e9fb3e217fe648cc (patch) | |
| tree | 0f13e6caf34722040fa0fd3725126ae4a94269cb /indra/newview/llchathistory.cpp | |
| parent | 87db6c59ee2ac5f8cc304d6f8150af5f91e3fb8d (diff) | |
| parent | 8fd2d69fdf47e0f586c6010c589411e251967038 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index c0c9ea1451..d6773b8b29 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" @@ -144,7 +145,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())); } } |