summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-02-07 14:41:38 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2013-02-07 14:41:38 -0800
commit29a57c16c976eb39b3a0e82872435e0228044ba9 (patch)
tree34e4a9c303ce0b340631b5bfa2959d84db159483 /indra/newview/llimview.cpp
parent3016afcd0623d8c086cfee36ebf5a0b3210c6fa5 (diff)
CHUI-736: When auto-exit DND mode upon startup, stored conversations are not highlighted. When the dnd im is processed, now flash the conversation line item.
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r--indra/newview/llimview.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index d4c8d8c4f4..2eaef48049 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -107,6 +107,7 @@ void process_dnd_im(const LLSD& notification)
{
LLSD data = notification["substitutions"];
LLUUID sessionID = data["SESSION_ID"].asUUID();
+ LLUUID fromID = data["FROM_ID"].asUUID();
//re-create the IM session if needed
//(when coming out of DND mode upon app restart)
@@ -119,14 +120,22 @@ void process_dnd_im(const LLSD& notification)
{
name = av_name.getDisplayName();
}
-
+
LLIMModel::getInstance()->newSession(sessionID,
name,
IM_NOTHING_SPECIAL,
- data["FROM_ID"],
+ fromID,
false,
false); //will need slight refactor to retrieve whether offline message or not (assume online for now)
+
+ LLFloaterIMContainer* im_box = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container");
+
+ if (im_box)
+ {
+ im_box->flashConversationItemWidget(sessionID, true);
+ }
+
}
}