diff options
| author | callum_linden <none@none> | 2015-10-26 14:22:31 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-10-26 14:22:31 -0700 |
| commit | a89e87c72e6a351c6d1c74ae59a2d7010578d26c (patch) | |
| tree | 46b3774ade40f99d1b2d1645b8e619ff5b6dc1ce /indra/newview/llchicletbar.cpp | |
| parent | 16cd296e30e95fbacefff4e291fbdd6fbf0c2c43 (diff) | |
| parent | 84150294b912d04e345007b65670c0230a2e4d79 (diff) | |
Merge with head of viewer release (3.8.6 changes)
Diffstat (limited to 'indra/newview/llchicletbar.cpp')
| -rwxr-xr-x | indra/newview/llchicletbar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llchicletbar.cpp b/indra/newview/llchicletbar.cpp index d8b04f7004..254e3f61a8 100755 --- a/indra/newview/llchicletbar.cpp +++ b/indra/newview/llchicletbar.cpp @@ -31,6 +31,7 @@ #include "lllayoutstack.h" #include "llpaneltopinfobar.h" #include "llsyswellwindow.h" +#include "llfloaternotificationstabbed.h" namespace { @@ -49,7 +50,7 @@ BOOL LLChicletBar::postBuild() mToolbarStack = getChild<LLLayoutStack>("toolbar_stack"); mChicletPanel = getChild<LLChicletPanel>("chiclet_list"); - showWellButton("notification_well", !LLNotificationWellWindow::getInstance()->isWindowEmpty()); + showWellButton("notification_well", !LLFloaterNotificationsTabbed::getInstance()->isWindowEmpty()); LLPanelTopInfoBar::instance().setResizeCallback(boost::bind(&LLChicletBar::fitWithTopInfoBar, this)); LLPanelTopInfoBar::instance().setVisibleCallback(boost::bind(&LLChicletBar::fitWithTopInfoBar, this)); |