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

fixed EXT-4643 “IM toasts don't appear after few teleport offers were sent to that avatar” 

corrected checking opened active IM session;
corrected restoring active IM session after logging IM notification;

--HG--
branch : product-engine
master
Alexei Arabadji 2010-01-26 18:25:42 +02:00
parent 9936155fb7
commit 43bb3d00ec
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llimview.cpp
View File

@ -95,7 +95,8 @@ void toast_callback(const LLSD& msg){
}
// check whether incoming IM belongs to an active session or not
if (LLIMModel::getInstance()->getActiveSessionID() == msg["session_id"])
if (LLIMModel::getInstance()->getActiveSessionID().notNull()
&& LLIMModel::getInstance()->getActiveSessionID() == msg["session_id"])
{
return;
}

9
indra/newview/llnotificationhandlerutil.cpp
View File

@ -123,7 +123,14 @@ void LLHandlerUtil::logToIM(const EInstantMessage& session_type,
message);
// restore active session id
LLIMModel::instance().setActiveSessionID(active_session_id);
if (active_session_id.isNull())
{
LLIMModel::instance().resetActiveSessionID();
}
else
{
LLIMModel::instance().setActiveSessionID(active_session_id);
}
}
}