summaryrefslogtreecommitdiff
path: root/indra/newview/llparticipantlist.cpp
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-24 11:00:03 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-24 11:00:03 +0100
commit6bcac50f64a00b2bf6eaea13813276bf7c78af81 (patch)
treece178e51bf959e2c9b197509c80234a24ae5a475 /indra/newview/llparticipantlist.cpp
parent5e5a895b766dedde50aa137cf58f388e9acfe56c (diff)
parent55c935ea764bc349fa5a329bf190cc6d00f343ca (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);