EXT-7138 WIP Moved implementation of LLVivoxVoiceClient::getVoiceEffectList() and LLVivoxVoiceClient::getVoiceEffectTemplateList() out of the header file

2 files changed, 12 insertions, 4 deletions

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index aa2fa45b6d..2fba8e7b5f 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 fcf8eaf3e9..39db87b6bd 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();