summaryrefslogtreecommitdiff
path: root/indra/newview/llspeakers.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-13 15:15:51 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-13 15:15:51 -0800
commiteae15689d8af7e2cd37108fda833bcc87f63eb4b (patch)
tree735dc7ac82a5d9f665b8fee5bd191381037f77db /indra/newview/llspeakers.cpp
parentc316edda259a3914ceb0c646a543f144c370a39b (diff)
parent6ad8674a8c5a87f438aa5ad6230396a859ba268e (diff)
automated merge PE->viewer2.0
Diffstat (limited to 'indra/newview/llspeakers.cpp')
-rw-r--r--indra/newview/llspeakers.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 010dfd1b33..0dd9203c6d 100644
--- a/indra/newview/llspeakers.cpp
+++ b/indra/newview/llspeakers.cpp
@@ -88,6 +88,11 @@ void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const std::string& first, c
mDisplayName = first + " " + last;
}
+bool LLSpeaker::isInVoiceChannel()
+{
+ return mStatus == LLSpeaker::STATUS_VOICE_ACTIVE || mStatus == LLSpeaker::STATUS_MUTED;
+}
+
LLSpeakerUpdateModeratorEvent::LLSpeakerUpdateModeratorEvent(LLSpeaker* source)
: LLEvent(source, "Speaker add moderator event"),
mSpeakerID (source->mID),