summaryrefslogtreecommitdiff
path: root/indra/newview/llparticipantlist.cpp
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-19 16:28:24 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-19 16:28:24 +0100
commitcb6b6b1b4fbca54f1c473ab730cf3481c1965ebe (patch)
treeb6eeecfc25e32ad8b6dec0eecf065a48a42e6d97 /indra/newview/llparticipantlist.cpp
parentb550bb0f09197c35b80d18d540761a7831c3e89b (diff)
parent95ed59a9dec737ffe8d566595e1a74f662fe1e43 (diff)
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
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 1117ae05d7..8839d84269 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -94,7 +94,7 @@ public:
mAvalineCallers.insert(avaline_caller_id);
}
- void onChange()
+ void onParticipantsChanged()
{
uuid_set_t participant_uuids;
LLVoiceClient::getInstance()->getParticipantList(participant_uuids);