summaryrefslogtreecommitdiff
path: root/indra/newview/llparticipantlist.cpp
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-18 14:17:32 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-18 14:17:32 +0100
commiteac888727a0a9726bdc85beebdc4eb0669906203 (patch)
tree4b4375f454d6a2ca4d70d9d549884eb4c444e4f4 /indra/newview/llparticipantlist.cpp
parentb6ed10e8285e4abef4f14c618186984ef4b2cf7f (diff)
parent24c55c9a689aaf7c8c961a5eb4aab5283b0fb1fa (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);