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

CHUI-618 User sees no indication of offline messages received with conversation log preference turned off: flashing of CHUI button if offline messages was received

master
AlexanderP ProductEngine 2012-12-20 15:24:14 +02:00
parent c81a0b0a57
commit 2aefdb47ca
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llimview.cpp
View File

@ -2488,16 +2488,23 @@ void LLIMMgr::addMessage(
}
// Open conversation log if offline messages are present and user allows a Call Log
if (is_offline_msg && gSavedSettings.getBOOL("KeepConversationLogTranscripts"))
{
LLFloaterConversationLog* floater_log =
LLFloaterReg::getTypedInstance<LLFloaterConversationLog>("conversation");
if (floater_log && !(floater_log->isFrontmost()))
if (is_offline_msg)
{
if (gSavedSettings.getBOOL("KeepConversationLogTranscripts"))
{
floater_log->openFloater();
floater_log->setFrontmost(TRUE);
LLFloaterConversationLog* floater_log =
LLFloaterReg::getTypedInstance<LLFloaterConversationLog>("conversation");
if (floater_log && !(floater_log->isFrontmost()))
{
floater_log->openFloater();
floater_log->setFrontmost(TRUE);
}
}
}
else
{
gToolBarView->flashCommand(LLCommandId("chat"), true);
}
}
//*NOTE session_name is empty in case of incoming P2P sessions
std::string fixed_session_name = from;