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

FIRE-17513: Backout the whole BS and continue to spam the log again until LL gets their act together and fixes their broken modal dialog implementation

master
Ansariel 2015-12-28 13:15:26 +01:00
parent 2b2c20143d
commit 91e09f97ba
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llui/llmodaldialog.h
View File

@ -77,7 +77,6 @@ private:
LLFrameTimer mVisibleTime;
const BOOL mModal;
protected: // <FS:Ansariel> FIRE-17439: Need access to stack in derived classes
static std::list<LLModalDialog*> sModalStack; // Top of stack is currently being displayed
};

6
indra/newview/lltoast.cpp
View File

@ -393,12 +393,6 @@ void LLToast::setVisible(BOOL show)
if (!getVisible())
{
LLModalDialog::setFrontmost(FALSE);
// <FS:Ansariel> Properly push the modal toast on the modal dialog stack
if (isModal() && std::find(sModalStack.begin(), sModalStack.end(), this) == sModalStack.end())
{
onOpen(LLSD());
}
// </FS:Ansariel>
}
}
else

11
indra/newview/llviewerwindow.cpp
View File

@ -2312,20 +2312,13 @@ void LLViewerWindow::shutdownViews()
}
LL_INFOS() << "Global views cleaned." << 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>
LLNotificationsUI::LLToast::cleanupToasts();
LL_INFOS() << "Leftover toast cleaned up." << LL_ENDL;
// 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