Skip to content
Snippets Groups Projects
Commit 637105e5 authored by Kent Quirk's avatar Kent Quirk
Browse files

Merge

parents 5e0be34c 167be8f7
No related branches found
No related tags found
No related merge requests found
...@@ -356,6 +356,11 @@ class LLHandlerUtil ...@@ -356,6 +356,11 @@ class LLHandlerUtil
*/ */
static void addNotifPanelToIM(const LLNotificationPtr& notification); static void addNotifPanelToIM(const LLNotificationPtr& notification);
/**
* Updates messages of IM floater.
*/
static void updateIMFLoaterMesages(const LLUUID& session_id);
/** /**
* Updates messages of visible IM floater. * Updates messages of visible IM floater.
*/ */
......
...@@ -252,6 +252,9 @@ void LLHandlerUtil::logToIM(const EInstantMessage& session_type, ...@@ -252,6 +252,9 @@ void LLHandlerUtil::logToIM(const EInstantMessage& session_type,
session->mNumUnread = unread; session->mNumUnread = unread;
session->mParticipantUnreadMessageCount = participant_unread; session->mParticipantUnreadMessageCount = participant_unread;
// update IM floater messages
updateIMFLoaterMesages(session_id);
// restore active session id // restore active session id
if (active_session_id.isNull()) if (active_session_id.isNull())
{ {
...@@ -415,12 +418,8 @@ void LLHandlerUtil::addNotifPanelToIM(const LLNotificationPtr& notification) ...@@ -415,12 +418,8 @@ void LLHandlerUtil::addNotifPanelToIM(const LLNotificationPtr& notification)
} }
// static // static
void LLHandlerUtil::updateVisibleIMFLoaterMesages(const LLNotificationPtr& notification) void LLHandlerUtil::updateIMFLoaterMesages(const LLUUID& session_id)
{ {
const std::string name = LLHandlerUtil::getSubstitutionName(notification);
LLUUID from_id = notification->getPayload()["from_id"];
LLUUID session_id = spawnIMSession(name, from_id);
LLIMFloater* im_floater = LLIMFloater::findInstance(session_id); LLIMFloater* im_floater = LLIMFloater::findInstance(session_id);
if (im_floater != NULL && im_floater->getVisible()) if (im_floater != NULL && im_floater->getVisible())
{ {
...@@ -428,6 +427,16 @@ void LLHandlerUtil::updateVisibleIMFLoaterMesages(const LLNotificationPtr& notif ...@@ -428,6 +427,16 @@ void LLHandlerUtil::updateVisibleIMFLoaterMesages(const LLNotificationPtr& notif
} }
} }
// static
void LLHandlerUtil::updateVisibleIMFLoaterMesages(const LLNotificationPtr& notification)
{
const std::string name = LLHandlerUtil::getSubstitutionName(notification);
LLUUID from_id = notification->getPayload()["from_id"];
LLUUID session_id = spawnIMSession(name, from_id);
updateIMFLoaterMesages(session_id);
}
// static // static
void LLHandlerUtil::decIMMesageCounter(const LLNotificationPtr& notification) void LLHandlerUtil::decIMMesageCounter(const LLNotificationPtr& notification)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment