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/llvoiceclient.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/llvoiceclient.h')
| -rw-r--r-- | indra/newview/llvoiceclient.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h index 8af12f9d38..2cc99d9e45 100644 --- a/indra/newview/llvoiceclient.h +++ b/indra/newview/llvoiceclient.h @@ -142,7 +142,8 @@ public: virtual LLVoiceDeviceList& getCaptureDevices()=0; virtual LLVoiceDeviceList& getRenderDevices()=0; - virtual std::vector<LLUUID> getParticipantList(void)=0; + virtual void getParticipantList(std::set<LLUUID> &participants)=0; + virtual bool isParticipant(const LLUUID& speaker_id)=0; //@} //////////////////////////// @@ -368,7 +369,8 @@ static const F32 OVERDRIVEN_POWER_LEVEL; ///////////////////////////// BOOL getAreaVoiceDisabled(); // returns true if the area the avatar is in is speech-disabled. // Use this to determine whether to show a "no speech" icon in the menu bar. - std::vector<LLUUID> getParticipantList(void); + void getParticipantList(std::set<LLUUID> &participants); + bool isParticipant(const LLUUID& speaker_id); ////////////////////////// /// @name text chat |