diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-05 18:33:39 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-05 18:33:39 -0800 |
| commit | 2d9d44e31643214c80bde5ffee03f9b6af6af9d0 (patch) | |
| tree | 6b0cb7a8a71acfa0838d97a43ac753e63a81bbfc /indra/newview/llimfloatercontainer.cpp | |
| parent | e3524a5fe159566edefb0bbc395e94ee3126adec (diff) | |
CHUI-468 : WIP : Taking LLAvatarList and related out of LLParticipantList
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 72e0f90f8c..e6657260e6 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -115,7 +115,7 @@ void LLIMFloaterContainer::sessionVoiceOrIMStarted(const LLUUID& session_id) void LLIMFloaterContainer::sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id) { - // CHUI-441 : We should do this *without* delete and recreate + // *TODO: We should do this *without* delete and recreate addConversationListItem(new_session_id, removeConversationListItem(old_session_id)); } @@ -1164,7 +1164,7 @@ LLConversationItem* LLIMFloaterContainer::addConversationListItem(const LLUUID& LLSpeakerMgr* speaker_manager = (is_nearby_chat ? (LLSpeakerMgr*)(LLLocalSpeakerMgr::getInstance()) : LLIMModel::getInstance()->getSpeakerManager(uuid)); if (speaker_manager) { - item = new LLParticipantList(speaker_manager, NULL, getRootViewModel(), true, false); + item = new LLParticipantList(speaker_manager, getRootViewModel(), true, false); } if (!item) { |