diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-17 15:15:23 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-17 15:15:23 -0800 |
| commit | 913eff0f675ba8938e298d24e8ef6d5c9c594acb (patch) | |
| tree | c7ce6bbdfa41efc25d899a981024f6a068e2782b /indra/newview/llchathistory.cpp | |
| parent | 889456e8924738936a9ee51a55d54d29ddd88bee (diff) | |
| parent | 3b3fa1c0ab74546538a02a69098afc99eddd49f5 (diff) | |
merge
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index f9c4a23f12..cd5c5edac0 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -46,6 +46,8 @@ #include "llfloaterreg.h" #include "llmutelist.h" +#include "llsidetray.h"//for blocked objects panel + static LLDefaultChildRegistry::Register<LLChatHistory> r("chat_history"); std::string formatCurrentTime() @@ -92,6 +94,8 @@ public: else if (level == "block") { LLMuteList::getInstance()->add(LLMute(getAvatarId(), mFrom, LLMute::OBJECT)); + + LLSideTray::getInstance()->showPanel("panel_block_list_sidetray", LLSD().insert("blocked_to_select", getAvatarId())); } } |