Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crash when clicking disabled event poll button

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-08 23:01:21 -03:00
parent e4064b0e07
commit 6e3059ead5
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llfloatermessagelog.cpp
View File

@@ -441,7 +441,13 @@ BOOL LLMessageLogFilterApply::tick()
LLFloaterMessageLog::sInstance->stopApplyingFilter();
return TRUE;
}
LLFloaterMessageLog::sInstance->conditionalLog(LLFloaterMessageLogItem((*mIter)));
try
{
LLFloaterMessageLog::sInstance->conditionalLog(LLFloaterMessageLogItem((*mIter)));
} catch (char *str)
{
llwarns << "DERPADERP" << llendl;
}
mIter++;
mProgress++;
}
@@ -619,6 +625,7 @@ void LLFloaterMessageLog::refreshNetList()
// Event queue isn't even supported yet... FIXME
LLScrollListIcon* icon = (LLScrollListIcon*)scroll_itemp->getColumn(3);
icon->setValue("icon_net_close_eventpoll_gray.tga");
icon->setClickCallback(NULL, NULL);
}
if(selected_id.notNull()) scrollp->selectByID(selected_id);
if(scroll_pos < scrollp->getItemCount()) scrollp->setScrollPos(scroll_pos);