From f3ae5789bea47a658085b0fddab9a06f0ecc2fe5 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Wed, 11 Jul 2012 18:43:31 +0200 Subject: [PATCH] Fix mute in voice --- indra/newview/llfloateractivespeakers.cpp | 6 ------ indra/newview/llfloateractivespeakers.h | 1 - 2 files changed, 7 deletions(-) diff --git a/indra/newview/llfloateractivespeakers.cpp b/indra/newview/llfloateractivespeakers.cpp index 6db1c30fa..321a825f1 100644 --- a/indra/newview/llfloateractivespeakers.cpp +++ b/indra/newview/llfloateractivespeakers.cpp @@ -341,7 +341,6 @@ BOOL LLPanelActiveSpeakers::postBuild() mMuteVoiceCtrl = getChild("mute_btn"); childSetCommitCallback("mute_btn", onClickMuteVoiceCommit, this); - childSetAction("mute_btn", onClickMuteVoice, this); childSetCommitCallback("speaker_volume", onVolumeChange, this); @@ -718,11 +717,6 @@ void LLPanelActiveSpeakers::onClickMuteTextCommit(LLUICtrl* ctrl, void* user_dat } } -//static -void LLPanelActiveSpeakers::onClickMuteVoice(void* user_data) -{ - onClickMuteVoiceCommit(NULL, user_data); -} //static void LLPanelActiveSpeakers::onClickMuteVoiceCommit(LLUICtrl* ctrl, void* user_data) diff --git a/indra/newview/llfloateractivespeakers.h b/indra/newview/llfloateractivespeakers.h index 8a70e77a0..97221cb60 100644 --- a/indra/newview/llfloateractivespeakers.h +++ b/indra/newview/llfloateractivespeakers.h @@ -224,7 +224,6 @@ public: void setVoiceModerationCtrlMode(const BOOL& moderated_voice); - static void onClickMuteVoice(void* user_data); static void onClickMuteVoiceCommit(LLUICtrl* ctrl, void* user_data); static void onClickMuteTextCommit(LLUICtrl* ctrl, void* user_data); static void onVolumeChange(LLUICtrl* source, void* user_data);