diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-08 17:15:44 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-08 17:15:44 -0800 |
| commit | 3d70cca7029cc536725088c8ff5d58ad0222eb64 (patch) | |
| tree | 3bdc286929e7a2b913232f0a21137655b399bad5 /indra/newview/llspeakers.cpp | |
| parent | 1d590cd5fdecabbbf6e96be37a2673de347e2224 (diff) | |
| parent | 5aa5a77af66425dd90599b0b0cad5b8f58d7669a (diff) | |
Pull merge from richard/viewer-chui.
Diffstat (limited to 'indra/newview/llspeakers.cpp')
| -rw-r--r-- | indra/newview/llspeakers.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index 46fd8c1290..726199b7aa 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -504,7 +504,7 @@ void LLSpeakerMgr::update(BOOL resort_ok) void LLSpeakerMgr::updateSpeakerList() { // are we bound to the currently active voice channel? - if ((!mVoiceChannel && LLVoiceClient::getInstance()->inProximalChannel()) || (mVoiceChannel && mVoiceChannel->isActive())) + if ((!mVoiceChannel && LLVoiceClient::getInstance()->inProximalChannel()) || (mVoiceChannel)) { std::set<LLUUID> participants; LLVoiceClient::getInstance()->getParticipantList(participants); |