diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-23 11:31:19 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-23 11:31:19 -0700 |
| commit | a1f49564d670a2c41bfa25c833bba2564b9b7f48 (patch) | |
| tree | 1d205e51bc37621916a17d459ad83782fe41f975 /indra/newview/llcommunicationchannel.cpp | |
| parent | 6af5db09faf5ea33a2d4c47b64e76f42edae178a (diff) | |
| parent | 6377610f6587989c126b00f490dfc8d527a1c2ce (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
Diffstat (limited to 'indra/newview/llcommunicationchannel.cpp')
| -rw-r--r-- | indra/newview/llcommunicationchannel.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/indra/newview/llcommunicationchannel.cpp b/indra/newview/llcommunicationchannel.cpp index cf98b56b4c..074d60d879 100644 --- a/indra/newview/llcommunicationchannel.cpp +++ b/indra/newview/llcommunicationchannel.cpp @@ -1,4 +1,4 @@ -/** +/** * @file llcommunicationchannel.cpp * @brief Implementation of llcommunicationchannel * @author Stinson@lindenlab.com @@ -38,8 +38,8 @@ LLCommunicationChannel::LLCommunicationChannel(const std::string& pName, const std::string& pParentName) - : LLNotificationChannel(pName, pParentName, filterByDoNotDisturbStatus) - , mHistory() + : LLNotificationChannel(pName, pParentName, filterByDoNotDisturbStatus) + , mHistory() { } @@ -49,7 +49,7 @@ LLCommunicationChannel::~LLCommunicationChannel() bool LLCommunicationChannel::filterByDoNotDisturbStatus(LLNotificationPtr) { - return !gAgent.isDoNotDisturb(); + return !gAgent.isDoNotDisturb(); } S32 LLCommunicationChannel::getHistorySize() const @@ -59,12 +59,12 @@ S32 LLCommunicationChannel::getHistorySize() const LLCommunicationChannel::history_list_t::const_iterator LLCommunicationChannel::beginHistory() const { - return mHistory.begin(); + return mHistory.begin(); } LLCommunicationChannel::history_list_t::const_iterator LLCommunicationChannel::endHistory() const { - return mHistory.end(); + return mHistory.end(); } LLCommunicationChannel::history_list_t::iterator LLCommunicationChannel::beginHistory() @@ -79,7 +79,7 @@ LLCommunicationChannel::history_list_t::iterator LLCommunicationChannel::endHist void LLCommunicationChannel::clearHistory() { - mHistory.clear(); + mHistory.clear(); } void LLCommunicationChannel::removeItemFromHistory(LLNotificationPtr p) @@ -95,19 +95,19 @@ void LLCommunicationChannel::removeItemFromHistory(LLNotificationPtr p) } } -void LLCommunicationChannel::onDelete(LLNotificationPtr p) +void LLCommunicationChannel::onDelete(LLNotificationPtr p) { removeItemFromHistory(p); } void LLCommunicationChannel::onFilterFail(LLNotificationPtr pNotificationPtr) { - std::string notificationType = pNotificationPtr->getType(); - if (((notificationType == "groupnotify") - || (notificationType == "offer") - || (notificationType == "notifytoast")) + std::string notificationType = pNotificationPtr->getType(); + if (((notificationType == "groupnotify") + || (notificationType == "offer") + || (notificationType == "notifytoast")) && !pNotificationPtr->isCancelled()) - { - mHistory.insert(history_list_t::value_type(pNotificationPtr->getDate(), pNotificationPtr)); - } + { + mHistory.insert(history_list_t::value_type(pNotificationPtr->getDate(), pNotificationPtr)); + } } |