diff options
| author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-05-18 21:08:22 +0300 |
|---|---|---|
| committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-05-18 21:08:22 +0300 |
| commit | 9a93bb1861219175d24610a3055131782096dd69 (patch) | |
| tree | c0d9682f233aff1f3d259b4803a85a0e289aac75 /indra/newview/llchicletbar.cpp | |
| parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
| parent | 60d28437e616a6afda51a368ea40ad49a707d16c (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)); |