diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-13 15:15:51 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-13 15:15:51 -0800 |
| commit | eae15689d8af7e2cd37108fda833bcc87f63eb4b (patch) | |
| tree | 735dc7ac82a5d9f665b8fee5bd191381037f77db /indra/newview/llinspectavatar.cpp | |
| parent | c316edda259a3914ceb0c646a543f144c370a39b (diff) | |
| parent | 6ad8674a8c5a87f438aa5ad6230396a859ba268e (diff) | |
automated merge PE->viewer2.0
Diffstat (limited to 'indra/newview/llinspectavatar.cpp')
| -rw-r--r-- | indra/newview/llinspectavatar.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 8f4fba244d..0374a1d25b 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -418,6 +418,7 @@ void LLInspectAvatar::updateModeratorPanel() LLPointer<LLSpeaker> selected_speakerp = speaker_mgr->findSpeaker(mAvatarID); if(speaker_mgr->isVoiceActive() && selected_speakerp && + selected_speakerp->isInVoiceChannel() && ((self_speakerp && self_speakerp->mIsModerator) || gAgent.isGodlike())) { getChild<LLUICtrl>("enable_voice")->setVisible(selected_speakerp->mModeratorMutedVoice); |