diff options
| author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-06-22 20:16:56 +0300 |
|---|---|---|
| committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-06-22 20:16:56 +0300 |
| commit | c148c1d6d904785db0b8df09038be0184faa0317 (patch) | |
| tree | fd598bb4dd3f4eea25464a6437ccce6f96a9e801 /indra/newview/llchicletbar.cpp | |
| parent | e0f5ed29daa3b2803aaec60a77bde8df7df292ee (diff) | |
| parent | 9b021ec787d05881bb0804c77896aa85d4ccdfe9 (diff) | |
merge changes for MAINT-4734
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)); |