Skip to content
Snippets Groups Projects
Commit 09c288ba authored by callum_linden's avatar callum_linden
Browse files

Update to build on Xcode 6.0: clang fix for bracketed logical operations

parent ae54e516
No related branches found
No related tags found
No related merge requests found
...@@ -103,9 +103,9 @@ void LLCommunicationChannel::onDelete(LLNotificationPtr p) ...@@ -103,9 +103,9 @@ void LLCommunicationChannel::onDelete(LLNotificationPtr p)
void LLCommunicationChannel::onFilterFail(LLNotificationPtr pNotificationPtr) void LLCommunicationChannel::onFilterFail(LLNotificationPtr pNotificationPtr)
{ {
std::string notificationType = pNotificationPtr->getType(); std::string notificationType = pNotificationPtr->getType();
if ((notificationType == "groupnotify") if (((notificationType == "groupnotify")
|| (notificationType == "offer") || (notificationType == "offer")
|| (notificationType == "notifytoast") || (notificationType == "notifytoast"))
&& !pNotificationPtr->isCancelled()) && !pNotificationPtr->isCancelled())
{ {
mHistory.insert(std::make_pair<LLDate, LLNotificationPtr>(pNotificationPtr->getDate(), pNotificationPtr)); mHistory.insert(std::make_pair<LLDate, LLNotificationPtr>(pNotificationPtr->getDate(), pNotificationPtr));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment