diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-04-19 16:27:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-04-19 16:27:38 -0400 |
| commit | 1b032c37833be3a03170a28b1955c55061936442 (patch) | |
| tree | f4500e347b6f18eeafe61217c4a9f884a8ebea34 /indra/newview/llspeakers.h | |
| parent | e07a60f6cc80d052377996b8c3ef9a9a20e20584 (diff) | |
| parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
merge changes for 5.0.4-release
Diffstat (limited to 'indra/newview/llspeakers.h')
| -rw-r--r-- | indra/newview/llspeakers.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h index 617bae3984..d1dbf72fe9 100644 --- a/indra/newview/llspeakers.h +++ b/indra/newview/llspeakers.h @@ -34,6 +34,7 @@ #include "llcoros.h" class LLSpeakerMgr; +class LLAvatarName; // data for a given participant in a voice channel class LLSpeaker : public LLRefCount, public LLOldEvents::LLObservable, public LLHandleProvider<LLSpeaker>, public boost::signals2::trackable @@ -61,7 +62,7 @@ public: ~LLSpeaker() {}; void lookupName(); - void onNameCache(const LLUUID& id, const std::string& full_name, bool is_group); + void onNameCache(const LLUUID& id, const LLAvatarName& full_name); bool isInVoiceChannel(); |