diff options
author | Aimee Linden <aimee@lindenlab.com> | 2010-05-25 03:37:19 +0100 |
---|---|---|
committer | Aimee Linden <aimee@lindenlab.com> | 2010-05-25 03:37:19 +0100 |
commit | 138f58cf399dc319f90bab46ff72c211327e250d (patch) | |
tree | 6e1c6722b7bd9d53cb64e8add2f17d9848d0d5a7 /indra/newview/llspeakingindicatormanager.cpp | |
parent | a146a0f27b3ea2fadaa9e7286645a0944996309d (diff) | |
parent | 3e85291fee01680f465198d895d12fef733b146c (diff) |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
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..ea7601517d 100644 --- a/indra/newview/llspeakingindicatormanager.cpp +++ b/indra/newview/llspeakingindicatormanager.cpp @@ -107,7 +107,7 @@ private: * So, method does not calculate difference between these list it only switches off already * switched on indicators and switches on indicators of voice channel participants */ - void onChange(); + void onParticipantsChanged(); /** * Changes state of indicators specified by LLUUIDs @@ -205,7 +205,7 @@ void SpeakingIndicatorManager::sOnCurrentChannelChanged(const LLUUID& /*session_ mSwitchedIndicatorsOn.clear(); } -void SpeakingIndicatorManager::onChange() +void SpeakingIndicatorManager::onParticipantsChanged() { LL_DEBUGS("SpeakingIndicator") << "Voice participant list was changed, updating indicators" << LL_ENDL; |