diff options
| author | callum_linden <none@none> | 2014-10-18 11:41:34 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-18 11:41:34 -0700 |
| commit | 09c288ba5e9b5234bbb0bc087f628f0d83eb5aa0 (patch) | |
| tree | e96cca8fd209e30d298b3b41d069a029fbb1ccb0 | |
| parent | ae54e5160ebe0cae5cdde49368f043ab8aded0a0 (diff) | |
Update to build on Xcode 6.0: clang fix for bracketed logical operations
| -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)); |