summaryrefslogtreecommitdiff
path: root/indra/newview/llparticipantlist.cpp
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-10 12:51:40 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-10 12:51:40 +0100
commit1cb1e3d16f322168395b4bb91985d7581110c379 (patch)
treed72d2ba67a27cabf3c364ee460f8c575dcabfd9f /indra/newview/llparticipantlist.cpp
parent8e1dbbbb5628eee210a0a7c25f32287d7b754a8b (diff)
parent79a8d839aadc56fc3566c21ccd437f8f675723c8 (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 8c908449a0..878bb6a2c0 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);