summaryrefslogtreecommitdiff
path: root/indra/newview/llparticipantlist.cpp
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-25 10:07:21 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-25 10:07:21 +0100
commitd849f5c81dd08c544476b902f3904f59f5fa5ac1 (patch)
tree001c0fc7574a7ddecb8f1b954e758127538670bb /indra/newview/llparticipantlist.cpp
parent2a99af8d949b982ea5832735c61ca249554f5b02 (diff)
parent138f58cf399dc319f90bab46ff72c211327e250d (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);