summaryrefslogtreecommitdiff
path: root/indra/newview/llparticipantlist.cpp
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-26 14:43:48 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-26 14:43:48 +0100
commit7ab53a6eec2617357ad6d7e7b2f2a3879a663124 (patch)
tree540549364526ececfe2c2a8e5c53d14b7e00a48f /indra/newview/llparticipantlist.cpp
parent14418c197076d0eb01bb0852b8716fa966bc9d53 (diff)
parent3c7df727eeb10a1e6adf27b7aa352afddfcd5d6d (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 b975536f8b..e59bc65b43 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);