summaryrefslogtreecommitdiff
path: root/indra/newview/llparticipantlist.cpp
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-04-30 19:39:10 +0100
committerAimee Linden <aimee@lindenlab.com>2010-04-30 19:39:10 +0100
commit79a8d839aadc56fc3566c21ccd437f8f675723c8 (patch)
tree62297fbf6ea7e5dd82ad94c708b013f13cb7c1a3 /indra/newview/llparticipantlist.cpp
parentd597a7e36a0a8c4cbee70b053c41aa01afeab6b5 (diff)
parent7a6474129c6015e102b30570fa474ba48e4c85e0 (diff)
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
-rw-r--r--indra/newview/llparticipantlist.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index c3748ca81d..d0c882e16e 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -92,7 +92,7 @@ public:
mAvalineCallers.insert(avaline_caller_id);
}
- void onChange()
+ void onParticipantsChanged()
{
uuid_set_t participant_uuids;
LLVoiceClient::getInstance()->getParticipantsUUIDSet(participant_uuids);