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

FIRE-17513: Another crash in LLModalDialog when trying to restore settings on a clean install

master
Ansariel 2015-12-20 23:20:00 +01:00
parent 812a8fe3c8
commit 4bcfbd8294
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llviewerwindow.cpp
View File

@ -2311,14 +2311,21 @@ void LLViewerWindow::shutdownViews()
gMorphView->setVisible(FALSE);
}
LL_INFOS() << "Global views cleaned." << LL_ENDL ;
LLNotificationsUI::LLToast::cleanupToasts();
LL_INFOS() << "Leftover toast cleaned up." << LL_ENDL;
// <FS:Ansariel> FIRE-17513: Need to shutdown modals first because toasts are derived from LLModalDialog
//LLNotificationsUI::LLToast::cleanupToasts();
//LL_INFOS() << "Leftover toast cleaned up." << LL_ENDL;
// </FS:Ansariel>
// DEV-40930: Clear sModalStack. Otherwise, any LLModalDialog left open
// will crump with LL_ERRS.
LLModalDialog::shutdownModals();
LL_INFOS() << "LLModalDialog shut down." << LL_ENDL;
// <FS:Ansariel> FIRE-17513: Need to shutdown modals first because toasts are derived from LLModalDialog
LLNotificationsUI::LLToast::cleanupToasts();
LL_INFOS() << "Leftover toast cleaned up." << LL_ENDL;
// </FS:Ansariel>
// destroy the nav bar, not currently part of gViewerWindow
// *TODO: Make LLNavigationBar part of gViewerWindow