diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-16 14:48:20 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-16 14:48:20 +0200 |
| commit | 2fed8d5182813e2077522bb5bbb2cc565b5c283d (patch) | |
| tree | 49e25123352870aff29e39f6ee5f85fe27a560d5 /indra | |
| parent | fee3752311907c774b595246f1dbb93ef5b8cd53 (diff) | |
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
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llnotificationhandlerutil.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index a37e796a6d..cb3d52fe13 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -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 = ""; |