diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-26 17:12:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-26 17:12:04 -0400 |
| commit | 54f39f86d205bdf52cd40fc0c4fcdd17ec694bb7 (patch) | |
| tree | 82685c6399bb058eda704f54c28ef47b5928d512 /indra/newview/llchicletbar.cpp | |
| parent | f676b02c45e81da5b22762acddcab8a8aa1cff71 (diff) | |
| parent | 84150294b912d04e345007b65670c0230a2e4d79 (diff) | |
merge changes for 3.8.6-release
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)); |