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

SL-18989 Saved notifications some times stops displaying information

meow-7.2.2
Andrey Kleshchev 2023-01-20 23:43:48 +02:00
parent 8ff51bdeb2
commit a94f907a17
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
indra/newview/lltoast.cpp
View File

@ -220,7 +220,11 @@ void LLToast::hide()
/*virtual*/
void LLToast::setFocus(BOOL b)
{
if (b && !hasFocus() && mPanel)
if (b
&& !hasFocus()
&& mPanel
&& mWrapperPanel
&& !mWrapperPanel->getChildList()->empty())
{
LLModalDialog::setFocus(TRUE);
// mostly for buttons
@ -416,15 +420,18 @@ void LLToast::setVisible(BOOL show)
//hide "hide" button in case toast was hidden without mouse_leave
if(mHideBtn)
mHideBtn->setVisible(show);
}
LLFloater::setVisible(show);
if(mPanel)
{
if(!mPanel->isDead())
{
mPanel->setVisible(show);
}
}
}
LLFloater::setVisible(show);
if (mPanel
&& !mPanel->isDead()
&& mWrapperPanel
&& !mWrapperPanel->getChildList()->empty()
// LLInspectToast can take over, but LLToast still appears to act like a data storage
&& mPanel->getParent() == mWrapperPanel
)
{
mPanel->setVisible(show);
}
}
void LLToast::updateHoveredState()