diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-04-07 10:27:10 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-04-07 10:27:10 -0700 |
| commit | de62c3378171a69ff9a39f2f626f1b1d33d0763f (patch) | |
| tree | 053883ba8ae6d02460736ed8a786f1913761b00d /indra/newview/llspeakingindicatormanager.cpp | |
| parent | 25df7aca29074b6ae7f108c91673be117522bfc9 (diff) | |
| parent | 3ecec85feb4e9878b32f5737ab8e35747360f138 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llspeakingindicatormanager.cpp')
| -rw-r--r-- | indra/newview/llspeakingindicatormanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp index 29237946d2..cc06179481 100644 --- a/indra/newview/llspeakingindicatormanager.cpp +++ b/indra/newview/llspeakingindicatormanager.cpp @@ -158,7 +158,7 @@ void SpeakingIndicatorManager::registerSpeakingIndicator(const LLUUID& speaker_i mSpeakingIndicators.insert(value_type); speaker_ids_t speakers_uuids; - BOOL is_in_same_voice = LLVoiceClient::getInstance()->isParticipant(speaker_id); + BOOL is_in_same_voice = LLVoiceClient::getInstance()->findParticipantByID(speaker_id) != NULL; speakers_uuids.insert(speaker_id); switchSpeakerIndicators(speakers_uuids, is_in_same_voice); @@ -210,7 +210,7 @@ void SpeakingIndicatorManager::onChange() LL_DEBUGS("SpeakingIndicator") << "Voice participant list was changed, updating indicators" << LL_ENDL; speaker_ids_t speakers_uuids; - LLVoiceClient::getInstance()->getParticipantList(speakers_uuids); + LLVoiceClient::getInstance()->getParticipantsUUIDSet(speakers_uuids); LL_DEBUGS("SpeakingIndicator") << "Switching all OFF, count: " << mSwitchedIndicatorsOn.size() << LL_ENDL; // switch all indicators off |