diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-05-12 02:24:46 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-05-12 02:24:46 +0100 |
| commit | 270da3e14161d7bf0d53b5f8ebfb9aaf5ad87893 (patch) | |
| tree | d0761d729cbf761636a2da1b16b04078f377f315 /indra | |
| parent | ba921a37fe5c3a7d8f5542fd3f5edf0d91ee12c7 (diff) | |
EXT-7138 WIP Allow selection of no voice font when none are available.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index e140c6f2ee..d8bf781ce0 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -7322,16 +7322,18 @@ bool LLVoiceClient::setVoiceFont(const LLUUID& id) return false; } - if (!hasVoiceFonts()) - { - LL_DEBUGS("Voice") << "Voice fonts not available." << LL_ENDL; - return false; - } - - if (!id.isNull() && (mVoiceFontMap.find(&id) == mVoiceFontMap.end())) + if (!id.isNull()) { - LL_DEBUGS("Voice") << "Invalid voice font " << id << LL_ENDL; - return false; + if (!hasVoiceFonts()) + { + LL_DEBUGS("Voice") << "Voice fonts not available." << LL_ENDL; + return false; + } + else if (mVoiceFontMap.find(&id) == mVoiceFontMap.end()) + { + LL_DEBUGS("Voice") << "Invalid voice font " << id << LL_ENDL; + return false; + } } // *TODO: Check for expired fonts? |