diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-27 15:28:26 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-27 15:28:26 +0100 |
| commit | 524fbefd2a3b7c6955d5929d7d121ede2386c1df (patch) | |
| tree | 1eccde9b330abd27f81bfaebde29e7fa443f132a /indra/newview/llimview.h | |
| parent | 0b78b5a2f093ea8df3484e893eda670e4c87cff7 (diff) | |
| parent | 21f19cb6f036787d93b186d6fcfd595ae6f03d87 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index e3851a56e0..81d3ffa1a6 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -391,8 +391,8 @@ public: const std::string& session_handle = LLStringUtil::null, const std::string& session_uri = LLStringUtil::null); - void processIMTypingStart(const LLIMInfo* im_info); - void processIMTypingStop(const LLIMInfo* im_info); + void processIMTypingStart(const LLUUID& from_id, const EInstantMessage im_type); + void processIMTypingStop(const LLUUID& from_id, const EInstantMessage im_type); // automatically start a call once the session has initialized void autoStartCallOnStartup(const LLUUID& session_id); @@ -471,7 +471,7 @@ private: void noteOfflineUsers(const LLUUID& session_id, const std::vector<LLUUID>& ids); void noteMutedUsers(const LLUUID& session_id, const std::vector<LLUUID>& ids); - void processIMTypingCore(const LLIMInfo* im_info, BOOL typing); + void processIMTypingCore(const LLUUID& from_id, const EInstantMessage im_type, BOOL typing); static void onInviteNameLookup(LLSD payload, const LLUUID& id, const LLAvatarName& name); |