diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 8 | 
1 files changed, 6 insertions, 2 deletions
| diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 409e507c16..a9e14e4e89 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -2658,12 +2658,16 @@ void LLVivoxVoiceClient::buildLocalAudioUpdates(std::ostringstream &stream)  void LLVivoxVoiceClient::checkFriend(const LLUUID& id)  { -	std::string name;  	buddyListEntry *buddy = findBuddy(id);  	// Make sure we don't add a name before it's been looked up. -	if(gCacheName->getFullName(id, name)) +	LLAvatarName av_name; +	if(LLAvatarNameCache::get(id, &av_name))  	{ +		// *NOTE: For now, we feed legacy names to Vivox because I don't know +		// if their service can support a mix of new and old clients with +		// different sorts of names. +		std::string name = av_name.getLegacyName();  		const LLRelationship* relationInfo = LLAvatarTracker::instance().getBuddyInfo(id);  		bool canSeeMeOnline = false; | 
