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

fixed EXT-5904 “Offers embedding into IM windows”, 

corrected offer counter(used silent adding message to session without
incrementing counter);
avoided assertion when received offer from blocked avatar with closed IM
session;

--HG--
branch : product-engine
meow-7.2.2
Alexei Arabadji 2010-03-16 14:48:20 +02:00
parent fee3752311
commit 2fed8d5182
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llnotificationhandlerutil.cpp
View File

@ -244,7 +244,7 @@ void LLHandlerUtil::logToIM(const EInstantMessage& session_type,
// set searched session as active to avoid IM toast popup
LLIMModel::instance().setActiveSessionID(session_id);
LLIMModel::instance().addMessage(session_id, from, from_id,
LLIMModel::instance().addMessageSilently(session_id, from, from_id,
message);
// restore active session id
@ -367,6 +367,10 @@ std::string LLHandlerUtil::getSubstitutionName(const LLNotificationPtr& notifica
if (res.empty())
{
LLUUID from_id = notification->getPayload()["FROM_ID"];
if (from_id.isNull())
{
from_id = notification->getPayload()["from_id"];
}
if(!gCacheName->getFullName(from_id, res))
{
res = "";