diff options
author | Aimee Linden <aimee@lindenlab.com> | 2010-05-19 21:19:19 +0100 |
---|---|---|
committer | Aimee Linden <aimee@lindenlab.com> | 2010-05-19 21:19:19 +0100 |
commit | 9363d9fc4b0954afc7c8bf8868733d955f770726 (patch) | |
tree | b2c7fc5165c9bd785671d91c13dfd37b45452fe7 /indra/newview/llspeakingindicatormanager.cpp | |
parent | d43ac77d1b6d1952fe3369079f6461b124466b38 (diff) | |
parent | 4f2f2f90378e5191cd00748c2cc6633af3efd230 (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; |