Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mute in voice

Browse Source
This commit is contained in:
Siana Gearz
2012-07-11 18:43:31 +02:00
parent a1f9109392
commit f3ae5789be
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloateractivespeakers.cpp
View File

@@ -341,7 +341,6 @@ BOOL LLPanelActiveSpeakers::postBuild()
mMuteVoiceCtrl = getChild<LLUICtrl>("mute_btn"); mMuteVoiceCtrl = getChild<LLUICtrl>("mute_btn");
childSetCommitCallback("mute_btn", onClickMuteVoiceCommit, this); childSetCommitCallback("mute_btn", onClickMuteVoiceCommit, this);
childSetAction("mute_btn", onClickMuteVoice, this);
childSetCommitCallback("speaker_volume", onVolumeChange, 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 //static
void LLPanelActiveSpeakers::onClickMuteVoiceCommit(LLUICtrl* ctrl, void* user_data) void LLPanelActiveSpeakers::onClickMuteVoiceCommit(LLUICtrl* ctrl, void* user_data)

1
indra/newview/llfloateractivespeakers.h
View File

@@ -224,7 +224,6 @@ public:
void setVoiceModerationCtrlMode(const BOOL& moderated_voice); void setVoiceModerationCtrlMode(const BOOL& moderated_voice);
static void onClickMuteVoice(void* user_data);
static void onClickMuteVoiceCommit(LLUICtrl* ctrl, void* user_data); static void onClickMuteVoiceCommit(LLUICtrl* ctrl, void* user_data);
static void onClickMuteTextCommit(LLUICtrl* ctrl, void* user_data); static void onClickMuteTextCommit(LLUICtrl* ctrl, void* user_data);
static void onVolumeChange(LLUICtrl* source, void* user_data); static void onVolumeChange(LLUICtrl* source, void* user_data);