summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-01-17 18:16:10 +0000
committerCho <cho@lindenlab.com>2013-01-17 18:16:10 +0000
commite05449e7fe5e39f61c45504e27e109ffb4b68195 (patch)
tree5ae36c93454557ff62caf739bd12aa194585e6ba /indra/newview
parent1a3de3b1fc79f7a237922fc813d97d3ba8deb4f3 (diff)
parent8c3d3d4b07f12e3462af7745016536389ab7cf73 (diff)
merging latest changes
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llimview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index ff171fc0f8..d0a8dfc0c8 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2620,8 +2620,9 @@ void LLIMMgr::addMessage(
if (is_offline_msg)
{
LLFloaterReg::showInstance("im_container");
+ LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container")->
+ flashConversationItemWidget(session_id, true);
}
-
}
void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLSD& args)