summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2009-11-17 14:40:02 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2009-11-17 14:40:02 +0200
commit53be27e742b642c1642c3289e3e11b300a14d360 (patch)
tree39ba2fee537a7883206bf4a0ff51983d2a740786
parent2105e9c716458e64209cce29a15c6ad45d4d6f6d (diff)
fox4 low task EXT-2480 Open Blocked List panel when blocking an object from nearby chat console
--HG-- branch : product-engine
-rw-r--r--indra/newview/llchathistory.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 028bb7a384..9916175775 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()));
}
}