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

FIRE-17834: Unscrew MAINT-2579 fix and apply the change only for those toasts it's necessary for

meow-7.2.2
Ansariel 2017-01-10 10:23:09 +01:00
parent 825351b445
commit 2f756e3d26
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/lltoast.cpp
View File

@ -405,6 +405,18 @@ void LLToast::setVisible(BOOL show)
{
mTimer->start();
}
// <FS:Ansariel> FIRE-17834: Local chat toasts sit above chat floater
if ((!mNotification.get() ||
(mNotification->getName() != "ScriptQuestion" &&
mNotification->getName() != "ScriptQuestionCaution" &&
mNotification->getName() != "ScriptQuestionExperience" &&
mNotification->getName() != "UnknownScriptQuestion")) &&
!getVisible())
{
LLModalDialog::setFrontmost(FALSE);
}
// </FS:Ansariel>
}
else
{