diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 16:15:46 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 16:15:46 -0400 |
| commit | 1b5f0590ce45ce6e540d266a8902af5839885cfb (patch) | |
| tree | f923407fc28fb2f046ac451976a02490ab15787e /indra/newview/llcommunicationchannel.h | |
| parent | f822193974af363fa4bb0208dc02848be6c983a2 (diff) | |
| parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) | |
Merge commit 'e7eced3' into nat/releaseos for whitespace fix.
Diffstat (limited to 'indra/newview/llcommunicationchannel.h')
| -rw-r--r-- | indra/newview/llcommunicationchannel.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/indra/newview/llcommunicationchannel.h b/indra/newview/llcommunicationchannel.h index 0d8f7f4387..f601de1dc4 100644 --- a/indra/newview/llcommunicationchannel.h +++ b/indra/newview/llcommunicationchannel.h @@ -1,4 +1,4 @@ -/** +/** * @file llcommunicationchannel.h * @brief Header file for llcommunicationchannel * @author Stinson@lindenlab.com @@ -36,30 +36,30 @@ class LLCommunicationChannel : public LLNotificationChannel { - LOG_CLASS(LLCommunicationChannel); + LOG_CLASS(LLCommunicationChannel); public: - LLCommunicationChannel(const std::string& pName, const std::string& pParentName); - virtual ~LLCommunicationChannel(); + LLCommunicationChannel(const std::string& pName, const std::string& pParentName); + virtual ~LLCommunicationChannel(); - static bool filterByDoNotDisturbStatus(LLNotificationPtr); + static bool filterByDoNotDisturbStatus(LLNotificationPtr); - typedef std::multimap<LLDate, LLNotificationPtr> history_list_t; - S32 getHistorySize() const; - history_list_t::const_iterator beginHistory() const; - history_list_t::const_iterator endHistory() const; + typedef std::multimap<LLDate, LLNotificationPtr> history_list_t; + S32 getHistorySize() const; + history_list_t::const_iterator beginHistory() const; + history_list_t::const_iterator endHistory() const; history_list_t::iterator beginHistory(); - history_list_t::iterator endHistory(); + history_list_t::iterator endHistory(); - void clearHistory(); + void clearHistory(); void removeItemFromHistory(LLNotificationPtr p); protected: virtual void onDelete(LLNotificationPtr p); - virtual void onFilterFail(LLNotificationPtr pNotificationPtr); + virtual void onFilterFail(LLNotificationPtr pNotificationPtr); private: - history_list_t mHistory; + history_list_t mHistory; }; #endif // LL_LLCOMMUNICATIONCHANNEL_H |