diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-29 18:25:03 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-29 18:25:03 -0800 |
| commit | a7549d6fe5b36b447f7e6f58387711576f9c2f63 (patch) | |
| tree | 63d81cf896b107cf35b3eecabefc032e021574df /indra/newview/llimview.h | |
| parent | 5bff5d28ee0cd6b2d17bf1676eecb0ae262f1f48 (diff) | |
| parent | f0426b924f543c62268ac5098c0c2c6a44e68084 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 62a54bc081..72fd006222 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -61,6 +61,7 @@ public: void sessionInitReplyReceived(const LLUUID& new_session_id); void addMessage(const std::string& from, const LLUUID& from_id, const std::string& utf8_text, const std::string& time); + void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state); static void chatFromLogFile(LLLogChat::ELogLineType type, const LLSD& msg, void* userdata); LLUUID mSessionID; @@ -145,6 +146,11 @@ public: bool addMessage(const LLUUID& session_id, const std::string& from, const LLUUID& other_participant_id, const std::string& utf8_text, bool log2file = true); /** + * Adds message without new message notification. + */ + void addMessageSilently(LLIMSession& session, const std::string& from, const LLUUID& other_participant_id, const std::string& utf8_text, bool log2file = true); + + /** * Add a system message to an IM Model */ bool proccessOnlineOfflineNotification(const LLUUID& session_id, const std::string& utf8_text); |