diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 13:45:23 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 13:45:23 -0800 |
| commit | af2cbcee129911cb4e1d25fbd710d755c13b0282 (patch) | |
| tree | a09d45e10d3b03c94256424ecd8f881e75551aae /indra/newview/llspeakers.h | |
| parent | 0a955ae550d3b810da67a17848a6cbc5ef11edb5 (diff) | |
| parent | 23a266521ead539cb3e8c2c76e7ead46847b70ca (diff) | |
Merge from viewer2, including fix for the test failure biting qarl.
Minor conflict in llviewerfloaterreg.cpp resolved.
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?) |