diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 12:16:36 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 12:16:36 +0100 |
| commit | 8da371b0f08f92fb1fef083f0bfb526f0698afd7 (patch) | |
| tree | b2ca851a0ef32e0994fb151a5457e615b4ea69c2 /indra/newview/llcallfloater.cpp | |
| parent | 1e7ae7a69398a1bca88812545da7bc86db9f3c38 (diff) | |
| parent | 244de628f2a71ea773cdcabb8328df26f20e3120 (diff) | |
merge
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 9dc31ec70b..44f1cefafe 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -663,8 +663,8 @@ void LLCallFloater::setVoiceRemoveTimer(const LLUUID& voice_speaker_id) bool LLCallFloater::removeVoiceLeftParticipant(const LLUUID& voice_speaker_id) { - LLAvatarList::uuid_vector_t& speaker_uuids = mAvatarList->getIDs(); - LLAvatarList::uuid_vector_t::iterator pos = std::find(speaker_uuids.begin(), speaker_uuids.end(), voice_speaker_id); + uuid_vec_t& speaker_uuids = mAvatarList->getIDs(); + uuid_vec_t::iterator pos = std::find(speaker_uuids.begin(), speaker_uuids.end(), voice_speaker_id); if(pos != speaker_uuids.end()) { speaker_uuids.erase(pos); |