livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-474 : Fixed. Refresh the participants list in torn off dialog more often.

master
Merov Linden 2012-10-31 19:27:41 -07:00
parent e672984a48
commit 7f2ea292e1
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llfolderview.cpp
View File

@ -566,7 +566,7 @@ void LLFolderView::sanitizeSelection()
parent_folder;
parent_folder = parent_folder->getParentFolder())
{
if (parent_folder->getViewModelItem()->potentiallyVisible())
if (parent_folder->getViewModelItem() && parent_folder->getViewModelItem()->potentiallyVisible())
{
// give initial selection to first ancestor folder that potentially passes the filter
if (!new_selection)

40
indra/newview/llimconversation.cpp
View File

@ -376,7 +376,44 @@ void LLIMConversation::updateConversationViewParticipant(const LLUUID& participa
void LLIMConversation::refreshConversation()
{
// *TODO: check that all participant models do have a view (debug consistency check)
// Debug : Check that all participant models do have a view (debug consistency check)
/*
LLParticipantList* item = getParticipantList();
llinfos << "Merov debug : Start consistency check" << llendl;
LLFolderViewModelItemCommon::child_list_t::const_iterator current_participant_model = item->getChildrenBegin();
LLFolderViewModelItemCommon::child_list_t::const_iterator end_participant_model = item->getChildrenEnd();
while (current_participant_model != end_participant_model)
{
LLConversationItemParticipant* participant_model = dynamic_cast<LLConversationItemParticipant*>(*current_participant_model);
if (participant_model != NULL)
{
LLUUID uuid = participant_model->getUUID();
LLFolderViewItem* widget = get_ptr_in_map(mConversationsWidgets,uuid);
if (!widget)
{
llinfos << "Merov debug : Consistency error! Couldn't find widget for " << participant_model->getName() << llendl;
}
else
{
llinfos << "Merov debug : Consistency check pass for " << participant_model->getName() << llendl;
}
}
else
{
llinfos << "Merov debug : Consistency check, skip non participant child" << llendl;
}
current_participant_model++;
}
llinfos << "Merov debug : End consistency check" << llendl;
*/
conversations_widgets_map::iterator widget_it = mConversationsWidgets.begin();
while (widget_it != mConversationsWidgets.end())
{
widget_it->second->refresh();
widget_it->second->setVisible(TRUE);
++widget_it;
}
mConversationViewModel.requestSortAll();
mConversationsRoot->arrangeAll();
mConversationsRoot->update();
@ -629,6 +666,7 @@ void LLIMConversation::onTearOffClicked()
initRectControl();
LLFloater::onClickTearOff(this);
updateHeaderAndToolbar();
refreshConversation();
}
// static