Identify fonts with UUIDs rather than using the font indexes directly as they are not guaranteed unique across sessions.

Replaced all references to "Font" with "Voice Font" where possible to reduce confusion for anyone grepping code in future.

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index f13e74679d..30f211d46d 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -250,15 +250,15 @@ void LLCallFloater::updateVoiceFont()
 	if (mVoiceFont)
 	{
 		mVoiceFont->removeall();
-		mVoiceFont->add(getString("no_voice_font"), 0);
+		mVoiceFont->add(getString("no_voice_font"), LLUUID::null);
 
-		if (LLVoiceClient::getInstance()->getVoiceFontsAvailable())
+		if (LLVoiceClient::getInstance()->hasVoiceFonts())
 		{
 			const LLVoiceClient::voice_font_list_t font_list = LLVoiceClient::getInstance()->getVoiceFontList();
 
 			for (LLVoiceClient::voice_font_list_t::const_iterator it = font_list.begin(); it != font_list.end(); ++it)
 			{
-				mVoiceFont->add(*(it->second), it->first, ADD_BOTTOM);
+				mVoiceFont->add(*(it->first), *(it->second), ADD_BOTTOM);
 			}
 			mVoiceFont->setEnabled(true);
 			mVoiceFont->setValue(LLVoiceClient::getInstance()->getVoiceFont());