diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 17:04:48 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 17:04:48 -0800 |
| commit | 6bb43e1369d957a041c796120e87a89ff3fa10ee (patch) | |
| tree | 678e25f3b62ab90e2940dfcae5feafa1acaa8ffc /indra/newview/llspeakers.h | |
| parent | ff52ac089f9ed67410f80fe66d0b997f0f2dafcc (diff) | |
| parent | fc633fce71c6bdd43ab009558c7556f528335fe0 (diff) | |
Automated merge up from viewer 2.0 trunk.
Some llvoiceclient changes duplicated changes that had already been
made in the voice modularization refactor, so the refactor versions
were used.
Diffstat (limited to 'indra/newview/llspeakers.h')
| -rw-r--r-- | indra/newview/llspeakers.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h index 1a8c23f56a..da8dfdf548 100644 --- a/indra/newview/llspeakers.h +++ b/indra/newview/llspeakers.h @@ -67,6 +67,8 @@ public: void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group); + bool isInVoiceChannel(); + ESpeakerStatus mStatus; // current activity status in speech group F32 mLastSpokeTime; // timestamp when this speaker last spoke F32 mSpeechVolume; // current speech amplitude (timea average rms amplitude?) |