livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

meow-7.2.2
callum_linden 2014-10-18 11:41:34 -07:00
parent ae54e5160e
commit 09c288ba5e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llcommunicationchannel.cpp
View File

@ -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));