summaryrefslogtreecommitdiff
path: root/indra/newview/llspeakers.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-14 14:44:43 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-14 14:44:43 -0800
commit1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (patch)
treea09d45e10d3b03c94256424ecd8f881e75551aae /indra/newview/llspeakers.cpp
parent04fe0399443cf4a5852e94cd3950ba1fd2d50562 (diff)
Backed out changeset f34a69c2af56
(this backs-out my backout, now that I'm happy the original merge works okay :))
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),