livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a method to clear the session font list

meow-7.2.2
Aimee Linden 2010-04-09 01:29:03 +01:00
parent 762672ad63
commit 5a8770c9e3
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llvoiceclient.cpp
View File

@ -527,7 +527,7 @@ void LLVivoxProtocolParser::StartTag(const char *tag, const char **attr)
nameString.clear();
descriptionString.clear();
expirationDateString.clear();
hasExpired.clear();
hasExpired = false;
fontTypeString.clear();
fontStatusString.clear();
}
@ -7157,13 +7157,21 @@ LLVoiceClient::voiceFontEntry::voiceFontEntry(S32 id) :
{
}
LLVoiceClient::voiceFontEntry *LLVoiceClient::addSessionFont(const voice_font_id_t &id,
const std::string &name,
const std::string &description,
const std::string &expirationDate,
const bool hasExpired,
const std::string &fontType,
const std::string &fontStatus)
void LLVoiceClient::clearSessionFonts()
{
// *FIX: Currently set voice font will be invalid
mSessionFontsReceived = false;
mSessionFontList.clear();
mSessionFontMap.clear();
}
void LLVoiceClient::addSessionFont(const voice_font_id_t &id,
const std::string &name,
const std::string &description,
const std::string &expirationDate,
const bool hasExpired,
const std::string &fontType,
const std::string &fontStatus)
{
voiceFontEntry *font = NULL;
@ -7189,7 +7197,6 @@ LLVoiceClient::voiceFontEntry *LLVoiceClient::addSessionFont(const voice_font_id
mSessionFontList.insert(voice_font_list_t::value_type(font->mID, &(font->mName)));
mSessionFontMap.insert(voice_font_map_t::value_type(font->mID, font));
}
return font;
}
bool LLVoiceClient::setVoiceFont(voice_font_id_t id)

15
indra/newview/llvoiceclient.h
View File

@ -452,13 +452,14 @@ static void updatePosition(void);
const voice_font_id_t getVoiceFont() const;
const voice_font_list_t &getVoiceFontList() const { return mSessionFontList; };
voiceFontEntry *addSessionFont(const voice_font_id_t &id,
const std::string &name,
const std::string &description,
const std::string &expirationDate,
const bool hasExpired,
const std::string &fontType,
const std::string &fontStatus);
void clearSessionFonts();
void addSessionFont(const voice_font_id_t &id,
const std::string &name,
const std::string &description,
const std::string &expirationDate,
const bool hasExpired,
const std::string &fontType,
const std::string &fontStatus);
void accountGetSessionFontsResponse(int statusCode, const std::string &statusString);
/////////////////////////////