summaryrefslogtreecommitdiff
path: root/indra/newview/llcommunicationchannel.cpp
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-04-28 12:03:31 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-04-28 12:03:31 +0300
commit89321a56fd95ade557be41a07e1b3deaa6162281 (patch)
tree0eee17609e3c72cdc5319f7ee9725214588baf72 /indra/newview/llcommunicationchannel.cpp
parentb2200f06dacfde4fe62a8f7f252e941c65d71c72 (diff)
parentfde0868231a25b8c9ce03a86cb53f1738d35688d (diff)
increment viewer version to 3.7.29
Diffstat (limited to 'indra/newview/llcommunicationchannel.cpp')
-rwxr-xr-xindra/newview/llcommunicationchannel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llcommunicationchannel.cpp b/indra/newview/llcommunicationchannel.cpp
index 0821510645..cf98b56b4c 100755
--- a/indra/newview/llcommunicationchannel.cpp
+++ b/indra/newview/llcommunicationchannel.cpp
@@ -103,11 +103,11 @@ 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));
+ mHistory.insert(history_list_t::value_type(pNotificationPtr->getDate(), pNotificationPtr));
}
}