diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-16 10:56:11 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-16 10:56:11 +0100 |
| commit | ae8985fe7087b337996459897b27704650932fd5 (patch) | |
| tree | 2c2bbf291242494b0b4f282bda85067f98ced6d6 /indra/newview/llspeakers.cpp | |
| parent | 42743f8b430e15613ad93d66463a5139aaed84ec (diff) | |
| parent | 960eb2c65fe5618bf977b80a3485a4346d5d85c6 (diff) | |
merge from PE's viewer-trunk
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 4573520647..ba6a44dff4 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -84,7 +84,7 @@ void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const std::string& first, c bool LLSpeaker::isInVoiceChannel() { - return mStatus == LLSpeaker::STATUS_VOICE_ACTIVE || mStatus == LLSpeaker::STATUS_MUTED; + return mStatus <= LLSpeaker::STATUS_VOICE_ACTIVE || mStatus == LLSpeaker::STATUS_MUTED; } LLSpeakerUpdateModeratorEvent::LLSpeakerUpdateModeratorEvent(LLSpeaker* source) |