diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2014-11-14 08:49:08 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2014-11-14 08:49:08 -0500 |
| commit | 6be2f0ba2b672fc37cd6d4e8adf62ae71bf8c842 (patch) | |
| tree | 86740538c9c2a2ff1359cf96db2521d99c8aebe7 /indra/newview/llcommunicationchannel.cpp | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
| parent | 316e35ad2a735784cfc309ea9fd74d2d9d1f985a (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llcommunicationchannel.cpp')
| -rwxr-xr-x | indra/newview/llcommunicationchannel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llcommunicationchannel.cpp b/indra/newview/llcommunicationchannel.cpp index 0821510645..627c9eb5c0 100755 --- a/indra/newview/llcommunicationchannel.cpp +++ b/indra/newview/llcommunicationchannel.cpp @@ -103,9 +103,9 @@ void LLCommunicationChannel::onDelete(LLNotificationPtr p) void LLCommunicationChannel::onFilterFail(LLNotificationPtr pNotificationPtr) { std::string notificationType = pNotificationPtr->getType(); - if ((notificationType == "groupnotify") + if (((notificationType == "groupnotify") || (notificationType == "offer") - || (notificationType == "notifytoast") + || (notificationType == "notifytoast")) && !pNotificationPtr->isCancelled()) { mHistory.insert(std::make_pair<LLDate, LLNotificationPtr>(pNotificationPtr->getDate(), pNotificationPtr)); |