diff options
author | Ramzi Linden <ramzi@lindenlab.com> | 2009-11-23 16:11:35 -0800 |
---|---|---|
committer | Ramzi Linden <ramzi@lindenlab.com> | 2009-11-23 16:11:35 -0800 |
commit | f39d4e98a73d5e13ce06f6188bf2d60d2db5d085 (patch) | |
tree | b39781e1fcbcc57139b395934594158102773c3b /indra/newview/llparticipantlist.cpp | |
parent | 58eab5547fcd5f665c5254f31afd778797e5c84c (diff) | |
parent | c9a1d3040e4ec8fde7bc1d69ea0509f0f7d288a1 (diff) |
merge
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
-rw-r--r-- | indra/newview/llparticipantlist.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 13bd059d45..4ee9cba69c 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -65,6 +65,8 @@ LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* av mAvatarList->setNoItemsCommentText(LLTrans::getString("LoadingData")); mAvatarList->setDoubleClickCallback(boost::bind(&LLParticipantList::onAvatarListDoubleClicked, this, mAvatarList)); mAvatarList->setRefreshCompleteCallback(boost::bind(&LLParticipantList::onAvatarListRefreshed, this, _1, _2)); + // Set onAvatarListDoubleClicked as default on_return action. + mAvatarList->setReturnCallback(boost::bind(&LLParticipantList::onAvatarListDoubleClicked, this, mAvatarList)); mParticipantListMenu = new LLParticipantListMenu(*this); mAvatarList->setContextMenu(mParticipantListMenu); @@ -99,6 +101,7 @@ void LLParticipantList::setSpeakingIndicatorsVisible(BOOL visible) void LLParticipantList::onAvatarListDoubleClicked(LLAvatarList* list) { + // NOTE(EM): Should we check if there is multiple selection and start conference if it is so? LLUUID clicked_id = list->getSelectedUUID(); if (clicked_id.isNull() || clicked_id == gAgent.getID()) |