diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-08-24 17:31:12 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-08-24 17:31:12 -0700 |
| commit | fd62242dd6e5fa464db07e0b8ebf3ab54a6067a2 (patch) | |
| tree | 22702b94c2e4bb14a0d41356eb4cf94ca02806de /indra/newview/llimconversation.cpp | |
| parent | b19e6c295972c83a2637a29007bc5d0a92711ea9 (diff) | |
CHUI-280 : Make LLParticipantList derives from LLConversationItemSession
Diffstat (limited to 'indra/newview/llimconversation.cpp')
| -rw-r--r-- | indra/newview/llimconversation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp index ee7f58b01f..f214003947 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -165,7 +165,7 @@ void LLIMConversation::buildParticipantList() if (mIsNearbyChat) { LLLocalSpeakerMgr* speaker_manager = LLLocalSpeakerMgr::getInstance(); - mParticipantList = new LLParticipantList(speaker_manager, getChild<LLAvatarList>("speakers_list"), true, false); + mParticipantList = new LLParticipantList(speaker_manager, getChild<LLAvatarList>("speakers_list"), mConversationViewModel, true, false); } else { @@ -174,7 +174,7 @@ void LLIMConversation::buildParticipantList() if(!mIsP2PChat && mSessionID.notNull() && speaker_manager) { delete mParticipantList; // remove the old list and create a new one if the session id has changed - mParticipantList = new LLParticipantList(speaker_manager, getChild<LLAvatarList>("speakers_list"), true, false); + mParticipantList = new LLParticipantList(speaker_manager, getChild<LLAvatarList>("speakers_list"), mConversationViewModel, true, false); } } updateHeaderAndToolbar(); |