Move the Voice Font control from LLCallFloater to its own panel so that it can be reused.

1 files changed, 1 insertions, 11 deletions

diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h
index 90b23eb4c4..e4341175e2 100644
--- a/indra/newview/llcallfloater.h
+++ b/indra/newview/llcallfloater.h
@@ -40,7 +40,6 @@
 
 class LLAvatarList;
 class LLAvatarListItem;
-class LLComboBox;
 class LLNonAvatarCaller;
 class LLOutputMonitorCtrl;
 class LLParticipantList;
@@ -58,9 +57,7 @@ class LLSpeakersDelayActionsStorage;
  * When the Resident is engaged in any chat except Nearby Chat, the Voice Control Panel
  * also provides a 'Leave Call' button to allow the Resident to leave that voice channel.
  */
-class LLCallFloater : public LLTransientDockableFloater,
-							 LLVoiceClientParticipantObserver,
-							 LLVoiceClientFontsObserver
+class LLCallFloater : public LLTransientDockableFloater, LLVoiceClientParticipantObserver
 {
 public:
 
@@ -80,9 +77,6 @@ public:
 	 */
 	/*virtual*/ void onParticipantsChanged();
 
-	/// Called by LLVoiceClient::notifyVoiceFontObservers when voice font list is changed.
-	/*virtual*/ void onVoiceFontsChanged();
-
 	static void sOnCurrentChannelChanged(const LLUUID& session_id);
 
 private:
@@ -107,9 +101,6 @@ private:
 
 	void leaveCall();
 
-	void onCommitVoiceFont();
-	void updateVoiceFont();
-
 	/**
 	 * Updates mSpeakerManager and list according to current Voice Channel
 	 *
@@ -239,7 +230,6 @@ private:
 	LLNonAvatarCaller* mNonAvatarCaller;
 	EVoiceControls mVoiceType;
 	LLPanel* mAgentPanel;
-	LLComboBox* mVoiceFont;
 	LLOutputMonitorCtrl* mSpeakingIndicator;
 	bool mIsModeratorMutedVoice;