From 09c288ba5e9b5234bbb0bc087f628f0d83eb5aa0 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Sat, 18 Oct 2014 11:41:34 -0700 Subject: Update to build on Xcode 6.0: clang fix for bracketed logical operations --- indra/newview/llcommunicationchannel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llcommunicationchannel.cpp') 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(pNotificationPtr->getDate(), pNotificationPtr)); -- cgit v1.2.3 From f884c008d5bb693ca93f6bf28221528666816e7e Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 15 Dec 2014 13:35:03 -0800 Subject: fix for some std::pair/STL syntax --- indra/newview/llcommunicationchannel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llcommunicationchannel.cpp') diff --git a/indra/newview/llcommunicationchannel.cpp b/indra/newview/llcommunicationchannel.cpp index 627c9eb5c0..cf98b56b4c 100755 --- a/indra/newview/llcommunicationchannel.cpp +++ b/indra/newview/llcommunicationchannel.cpp @@ -108,6 +108,6 @@ void LLCommunicationChannel::onFilterFail(LLNotificationPtr pNotificationPtr) || (notificationType == "notifytoast")) && !pNotificationPtr->isCancelled()) { - mHistory.insert(std::make_pair(pNotificationPtr->getDate(), pNotificationPtr)); + mHistory.insert(history_list_t::value_type(pNotificationPtr->getDate(), pNotificationPtr)); } } -- cgit v1.2.3