Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/

--HG--
branch : product-engine

1 files changed, 14 insertions, 5 deletions

diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index 5affd5c677..55e0f33121 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -252,6 +252,9 @@ void LLHandlerUtil::logToIM(const EInstantMessage& session_type,
 		session->mNumUnread = unread;
 		session->mParticipantUnreadMessageCount = participant_unread;
 
+		// update IM floater messages
+		updateIMFLoaterMesages(session_id);
+
 		// restore active session id
 		if (active_session_id.isNull())
 		{
@@ -415,12 +418,8 @@ void LLHandlerUtil::addNotifPanelToIM(const LLNotificationPtr& notification)
 }
 
 // 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);
 	if (im_floater != NULL && im_floater->getVisible())
 	{
@@ -429,6 +428,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
 void LLHandlerUtil::decIMMesageCounter(const LLNotificationPtr& notification)
 {
 	const std::string name = LLHandlerUtil::getSubstitutionName(notification);