diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-04-16 10:40:50 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-04-16 10:40:50 -0700 |
| commit | a1a43f7942f68e75eaadaa9c5280ac196c4ed6a7 (patch) | |
| tree | fd46ccd3fe330f4bdaf6a5dec368ff2d1195899c /indra/newview/llspeakers.cpp | |
| parent | 020a1b5b8a5aa09e677640491616d846c40a260e (diff) | |
| parent | 35168862f5ecc06166fbd1a9bcd601ae2abbf75b (diff) | |
Merge
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) |