diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-04 11:19:26 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-04 11:19:26 -0400 |
| commit | 83bd99df5dfbe1fec188d20922cf3b367b79c827 (patch) | |
| tree | ed6a3fe90f058d1a3c57e425fcf2ead95490b8fd /indra/newview/llcallfloater.cpp | |
| parent | 3a1f0ef173e5853f20aed93c741a9f74637d7d36 (diff) | |
SH-270 FIXED As a SL user, I want my speaker order settings to persist between sessions
SH-271 FIXED Add #ifdefs to llparticipantlist.h
Changed speaker order to store its speaker ordering using settings.xml.
Did some superficial code cleanup.
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index c78f73c3b8..2dfc30675e 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -44,6 +44,7 @@ #include "llspeakers.h" #include "lltextutil.h" #include "lltransientfloatermgr.h" +#include "llviewercontrol.h" #include "llviewerwindow.h" #include "llvoicechannel.h" #include "llviewerparcelmgr.h" @@ -327,8 +328,9 @@ void LLCallFloater::refreshParticipantList() { mParticipants = new LLParticipantList(mSpeakerManager, mAvatarList, true, mVoiceType != VC_GROUP_CHAT && mVoiceType != VC_AD_HOC_CHAT, false); mParticipants->setValidateSpeakerCallback(boost::bind(&LLCallFloater::validateSpeaker, this, _1)); - mParticipants->setSortOrder(LLParticipantList::E_SORT_BY_RECENT_SPEAKERS); - + const U32 speaker_sort_order = gSavedSettings.getU32("SpeakerParticipantDefaultOrder"); + mParticipants->setSortOrder(LLParticipantList::EParticipantSortOrder(speaker_sort_order)); + if (LLLocalSpeakerMgr::getInstance() == mSpeakerManager) { mAvatarList->setNoItemsCommentText(getString("no_one_near")); |