diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-05-01 09:04:14 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-05-01 09:04:14 -0700 |
| commit | bb0e2e6b957f9abf3ddc819d20aea3936d500467 (patch) | |
| tree | bc6ed362332740ea6e5829966d1afd618f1b60fb /indra/newview/llimview.h | |
| parent | dca8d3b5f569ed0b074a58cd054ea3065a15a717 (diff) | |
| parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index da40ac8393..e3851a56e0 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -473,7 +473,7 @@ private: void processIMTypingCore(const LLIMInfo* im_info, BOOL typing); - static void onInviteNameLookup(LLSD payload, const LLUUID& id, const std::string& name, bool is_group); + static void onInviteNameLookup(LLSD payload, const LLUUID& id, const LLAvatarName& name); void notifyObserverSessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, bool has_offline_msg); //Triggers when a session has already been added |