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/llcallfloater.cpp | |
| 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/llcallfloater.cpp')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 38782226d6..b0a5235e17 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -481,9 +481,10 @@ void LLCallFloater::updateAgentModeratorState() static void get_voice_participants_uuids(std::vector<LLUUID>& speakers_uuids) { // Get a list of participants from VoiceClient - std::vector<LLUUID> participants = LLVoiceClient::getInstance()->getParticipantList(); + std::set<LLUUID> participants; + LLVoiceClient::getInstance()->getParticipantList(participants); - for (std::vector<LLUUID>::const_iterator iter = participants.begin(); + for (std::set<LLUUID>::const_iterator iter = participants.begin(); iter != participants.end(); ++iter) { speakers_uuids.push_back(*iter); |