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

Fixed normal bug EXT-3762 - New notifications don't appear in the Notifications Well until they fade away in the channel. 

--HG--
branch : product-engine
meow-7.2.2
Dmitry Zaporozhan 2009-12-30 16:58:49 +02:00
parent e214b6e360
commit 5eb4d0b219
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llscreenchannel.cpp
View File

@ -234,6 +234,11 @@ void LLScreenChannel::addToast(const LLToast::Params& p)
if(show_toast)
{
mToastList.push_back(new_toast_elem);
if(p.can_be_stored)
{
// store toasts immediately - EXT-3762
storeToast(new_toast_elem);
}
updateShowToastsState();
redrawToasts();
}
@ -306,7 +311,6 @@ void LLScreenChannel::storeToast(ToastElem& toast_elem)
if( it != mStoredToastList.end() )
return;
toast_elem.toast->stopTimer();
mStoredToastList.push_back(toast_elem);
mOnStoreToast(toast_elem.toast->getPanel(), toast_elem.id);
}
@ -343,6 +347,13 @@ void LLScreenChannel::loadStoredToastByNotificationIDToChannel(LLUUID id)
mOverflowToastHidden = false;
LLToast* toast = (*it).toast;
if(toast->getVisible())
{
// toast is already in channel
return;
}
toast->setIsHidden(false);
toast->resetTimer();
mToastList.push_back((*it));