livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Kent Quirk 2010-03-19 11:56:28 -04:00
parent 5e0be34c26 167be8f755
commit 637105e5cf
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llnotificationhandler.h
View File

@ -356,6 +356,11 @@ public:
*/
static void addNotifPanelToIM(const LLNotificationPtr& notification);
/**
* Updates messages of IM floater.
*/
static void updateIMFLoaterMesages(const LLUUID& session_id);
/**
* Updates messages of visible IM floater.
*/

19
indra/newview/llnotificationhandlerutil.cpp
View File

@ -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())
{
@ -414,6 +417,16 @@ void LLHandlerUtil::addNotifPanelToIM(const LLNotificationPtr& notification)
LLIMModel::getInstance()->mNewMsgSignal(arg);
}
// static
void LLHandlerUtil::updateIMFLoaterMesages(const LLUUID& session_id)
{
LLIMFloater* im_floater = LLIMFloater::findInstance(session_id);
if (im_floater != NULL && im_floater->getVisible())
{
im_floater->updateMessages();
}
}
// static
void LLHandlerUtil::updateVisibleIMFLoaterMesages(const LLNotificationPtr& notification)
{
@ -421,11 +434,7 @@ void LLHandlerUtil::updateVisibleIMFLoaterMesages(const LLNotificationPtr& notif
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())
{
im_floater->updateMessages();
}
updateIMFLoaterMesages(session_id);
}
// static