diff options
author | Merov Linden <merov@lindenlab.com> | 2012-12-04 14:52:19 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-12-04 14:52:19 -0800 |
commit | 90f9f5dbad8a0e6dc20b3f7fc58527e572a6b3f7 (patch) | |
tree | 2b6d67485b851d3c9a7adcad4709fed64b11c428 /indra/newview/llimview.cpp | |
parent | b43c8afc36a11c34fa76443be85430cac6c72c42 (diff) | |
parent | 3f6f374c2566c85e1a9480da674bfc2172dd9162 (diff) |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r-- | indra/newview/llimview.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index e5dda7e8d8..b6fd3ec9c8 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -191,6 +191,12 @@ void on_new_message(const LLSD& msg) } else if("openconversations" == action) { + LLFloaterIMContainer* im_box = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"); + if (im_box) + { + im_box->flashConversationItemWidget(session_id, true); // flashing of the conversation's item + } + LLFloaterReg::showInstance("im_container"); } } |