diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-10-22 14:27:56 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-10-22 14:27:56 -0700 |
| commit | b30a0b4bdb8493592ac918b1a8649d7dbb3bae51 (patch) | |
| tree | 4688747aca7195cc996451cc4bd376bf1764eb4b /indra/newview/llvoicevivox.h | |
| parent | be1c9a867440e4306348887ce07c88ba6cd31241 (diff) | |
| parent | d3f3dd0998ee8a2159a98d2d8b4b02dce6176252 (diff) | |
merge
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); ///////////////////////////// |