diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index aa2fa45b6d0840269b9a45eaf3e46d42ad787d85..2fba8e7b5f0d5b6ca61c2a74f9d3355e8ef5e69c 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -6338,6 +6338,16 @@ void LLVivoxVoiceClient::refreshVoiceEffectLists(bool clear_lists) accountGetTemplateFontsSendMessage(); } +const voice_effect_list_t& LLVivoxVoiceClient::getVoiceEffectList() const +{ + return mVoiceFontList; +} + +const voice_effect_list_t& LLVivoxVoiceClient::getVoiceEffectTemplateList() const +{ + return mVoiceFontTemplateList; +} + void LLVivoxVoiceClient::addVoiceFont(const S32 font_index, const std::string &name, const std::string &description, diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h index fcf8eaf3e92a5a16dce564e99b1abeb0f60fdea7..39db87b6bddc51e7f2fc22de8d601cdb1e3a1456 100644 --- a/indra/newview/llvoicevivox.h +++ b/indra/newview/llvoicevivox.h @@ -242,8 +242,8 @@ public: virtual const LLUUID getVoiceEffect(); virtual void refreshVoiceEffectLists(bool clear_lists); - virtual const voice_effect_list_t &getVoiceEffectList() const { return mVoiceFontList; }; - virtual const voice_effect_list_t &getVoiceEffectTemplateList() const { return mVoiceFontTemplateList; }; + virtual const voice_effect_list_t& getVoiceEffectList() const; + virtual const voice_effect_list_t& getVoiceEffectTemplateList() const; //@} ////////////////////////////// @@ -455,8 +455,6 @@ protected: void tuningCaptureStartSendMessage(int duration); void tuningCaptureStopSendMessage(); - bool inTuningStates(); - //---------------------------------- // devices void clearCaptureDevices();