diff options
author | Aimee Linden <aimee@lindenlab.com> | 2010-04-30 19:39:10 +0100 |
---|---|---|
committer | Aimee Linden <aimee@lindenlab.com> | 2010-04-30 19:39:10 +0100 |
commit | 79a8d839aadc56fc3566c21ccd437f8f675723c8 (patch) | |
tree | 62297fbf6ea7e5dd82ad94c708b013f13cb7c1a3 /indra/newview/llspeakingindicatormanager.cpp | |
parent | d597a7e36a0a8c4cbee70b053c41aa01afeab6b5 (diff) | |
parent | 7a6474129c6015e102b30570fa474ba48e4c85e0 (diff) |
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
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 cc06179481..70028dc21b 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; |