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

STORM-391 : pull into viewer-development

meow-7.2.2
Merov Linden 2010-12-13 14:26:36 -08:00
parent 37cd8ad2a2 0d764afb9c
commit 7ce570e2c5
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llscreenchannel.cpp
View File

@ -595,20 +595,15 @@ void LLScreenChannel::showToastsBottom()
}
}
// Dismiss toasts we don't have space for (STORM-391).
if(it != mToastList.rend())
{
mHiddenToastsNum = 0;
for(; it != mToastList.rend(); it++)
{
(*it).toast->stopTimer();
(*it).toast->setVisible(FALSE);
mHiddenToastsNum++;
(*it).toast->hide();
}
}
else
{
closeOverflowToastPanel();
}
}
//--------------------------------------------------------------------------
@ -731,7 +726,6 @@ void LLNotificationsUI::LLScreenChannel::startToastTimer(LLToast* toast)
//--------------------------------------------------------------------------
void LLScreenChannel::hideToastsFromScreen()
{
closeOverflowToastPanel();
for(std::vector<ToastElem>::iterator it = mToastList.begin(); it != mToastList.end(); it++)
(*it).toast->setVisible(FALSE);
}

3
indra/newview/llscreenchannel.h
View File

@ -81,9 +81,6 @@ public:
// show all toasts in a channel
virtual void redrawToasts() {};
virtual void closeOverflowToastPanel() {};
virtual void hideOverflowToastPanel() {};
// Channel's behavior-functions
// set whether a channel will control hovering inside itself or not