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

Finish up last commit

Browse Source 
Fixes the segfault that was accidentally overlooked because voice decided to not return after the first run as I worked on all the other warnings
Thanks to Latif Khalifa for the VoiceMultiInstance debug setting which enabled me to use voice again.
This commit is contained in:
Lirusaito
2013-03-05 20:56:14 -05:00
parent db39bab95b
commit 32b513a025
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llfloateractivespeakers.cpp
View File

@@ -338,15 +338,9 @@ BOOL LLPanelActiveSpeakers::postBuild()
childSetAction("profile_btn", onClickProfile, this); childSetAction("profile_btn", onClickProfile, this);
if (findChild<LLUICtrl>("moderator_allow_voice")) if (findChild<LLUICtrl>("moderator_allow_voice"))
{
childSetCommitCallback("moderator_allow_voice", onModeratorMuteVoice, this); childSetCommitCallback("moderator_allow_voice", onModeratorMuteVoice, this);
mModeratorAllowVoiceCheckbox.connect(this,"moderator_allow_voice");
}
if (findChild<LLUICtrl>("moderator_allow_text")) if (findChild<LLUICtrl>("moderator_allow_text"))
{
childSetCommitCallback("moderator_allow_text", onModeratorMuteText, this); childSetCommitCallback("moderator_allow_text", onModeratorMuteText, this);
mModeratorAllowTextCheckbox.connect(this,"moderator_allow_text");
}
if (findChild<LLUICtrl>("moderator_mode")) if (findChild<LLUICtrl>("moderator_mode"))
childSetCommitCallback("moderation_mode", onChangeModerationMode, this); childSetCommitCallback("moderation_mode", onChangeModerationMode, this);
@@ -635,13 +629,11 @@ void LLPanelActiveSpeakers::refreshSpeakers()
if (LLView* view = findChild<LLView>("moderator_controls_label")) if (LLView* view = findChild<LLView>("moderator_controls_label"))
view->setEnabled(selected_id.notNull()); view->setEnabled(selected_id.notNull());
mModeratorAllowVoiceCheckbox->setEnabled( if (LLView* view = findChild<LLView>("moderator_allow_voice"))
selected_id.notNull() view->setEnabled(selected_id.notNull() && mSpeakerMgr->isVoiceActive() && gVoiceClient->getVoiceEnabled(selected_id));
&& mSpeakerMgr->isVoiceActive()
&& gVoiceClient->getVoiceEnabled(selected_id));
mModeratorAllowTextCheckbox->setEnabled( if (LLView* view = findChild<LLView>("moderator_allow_text"))
selected_id.notNull()); view->setEnabled(selected_id.notNull());
if (mProfileBtn) if (mProfileBtn)
{ {

2
indra/newview/llfloateractivespeakers.h
View File

@@ -299,8 +299,6 @@ protected:
LLPointer<SpeakerClearListener> mSpeakerClearListener; LLPointer<SpeakerClearListener> mSpeakerClearListener;
CachedUICtrl<LLUICtrl> mVolumeSlider; CachedUICtrl<LLUICtrl> mVolumeSlider;
CachedUICtrl<LLCheckBoxCtrl> mModeratorAllowVoiceCheckbox;
CachedUICtrl<LLCheckBoxCtrl> mModeratorAllowTextCheckbox;
}; };