summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-04-16 12:04:41 +0300
committerMike Antipov <mantipov@productengine.com>2010-04-16 12:04:41 +0300
commit956041ff1b26edc7c90fb7dbdf0d6ebff82e48b8 (patch)
treea52bfbc05ddd53ce97886a951c37d40eb01e125a
parent77f35a5b06b48b41a685c8c5c492fbc9da155663 (diff)
Fixed major bug EXT-6851 (Moderator is unable to mute group voice chat participant after his reconnect)
Reason: not proper condition to check is LLSpeaker is in voice channel (implemented for EXT-3944) Fix: Updated condition to check is speaker in voice channel state. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/242/ (transplanted from fb2af72d10231e04b2e79a7d487ea9e8559c14b8)
-rw-r--r--indra/newview/llspeakers.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 6cf9c6b95d..c04b5f98af 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)