From 713eb289b0128cae540866f38e0baff187ef3392 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Fri, 12 Feb 2010 17:54:57 +0200 Subject: Fixed normal bug EXT-5117 (Voice Control Panel sorting should default to by Recent speaker). - Changed sort order of participant list in VCP to by Recent speaker after it's creation. --HG-- branch : product-engine --- indra/newview/llcallfloater.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llcallfloater.cpp') diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 0aaaa8e705..3c4f791d91 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -333,6 +333,7 @@ void LLCallFloater::refreshParticipantList() { mParticipants = new LLParticipantList(mSpeakerManager, mAvatarList, true, mVoiceType != VC_GROUP_CHAT && mVoiceType != VC_AD_HOC_CHAT); mParticipants->setValidateSpeakerCallback(boost::bind(&LLCallFloater::validateSpeaker, this, _1)); + mParticipants->setSortOrder(LLParticipantList::E_SORT_BY_RECENT_SPEAKERS); if (LLLocalSpeakerMgr::getInstance() == mSpeakerManager) { -- cgit v1.2.3 From df6af052e0e8810b0ba82245a970091be8c1eb6b Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 12 Feb 2010 17:37:08 +0000 Subject: CID-428 Checker: FORWARD_NULL Function: LLCallFloater::updateSession() File: /indra/newview/llcallfloater.cpp --- indra/newview/llcallfloater.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llcallfloater.cpp') diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 3c4f791d91..76e058a1c3 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -304,7 +304,9 @@ void LLCallFloater::updateSession() updateAgentModeratorState(); //show floater for voice calls & only in CONNECTED to voice channel state - if (!is_local_chat && LLVoiceChannel::STATE_CONNECTED == voice_channel->getState()) + if (!is_local_chat && + voice_channel && + LLVoiceChannel::STATE_CONNECTED == voice_channel->getState()) { LLIMFloater* im_floater = LLIMFloater::findInstance(session_id); bool show_me = !(im_floater && im_floater->getVisible()); -- cgit v1.2.3