diff options
| author | Tofu Buzzard <no-email> | 2010-10-15 09:52:11 +0100 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-10-15 09:52:11 +0100 |
| commit | ad033a4b35387a343f2204cda64ecb590888b60e (patch) | |
| tree | 6b2191d8e082bc84e28b2bbaa4dcea95cf68a797 /indra/newview/llvoicevivox.h | |
| parent | 393c819477b268aa0a05ec0a006e1dba27d6e6c6 (diff) | |
| parent | 508686047d5e98934d5fefbb576e54f108df6fe3 (diff) | |
sync up to viewer-developer
Diffstat (limited to 'indra/newview/llvoicevivox.h')
| -rw-r--r-- | indra/newview/llvoicevivox.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h index 08f2f75a39..3ba517bf36 100644 --- a/indra/newview/llvoicevivox.h +++ b/indra/newview/llvoicevivox.h @@ -45,7 +45,7 @@ class LLVivoxProtocolParser; #endif #include "llvoiceclient.h" - +class LLAvatarName; class LLVivoxVoiceAccountProvisionResponder; class LLVivoxVoiceClientMuteListObserver; class LLVivoxVoiceClientFriendsObserver; @@ -649,7 +649,7 @@ protected: void leaveAudioSession(); void lookupName(const LLUUID &id); - static void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group); + void onAvatarNameCache(const LLUUID& id, const LLAvatarName& av_name); void avatarNameResolved(const LLUUID &id, const std::string &name); ///////////////////////////// |