summaryrefslogtreecommitdiff
path: root/indra/newview/llchicletbar.cpp
diff options
context:
space:
mode:
authorpavelk_productengine <none@none>2015-01-09 20:17:39 +0200
committerpavelk_productengine <none@none>2015-01-09 20:17:39 +0200
commite5d6a14f05f857ecbbbd9b464db3ece82d1d099f (patch)
tree65954afb82a7b2e1df300ea714afd88460ac3660 /indra/newview/llchicletbar.cpp
parent4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff)
MAINT-4734 (Separate transaction notices from group notice/invites) - initial version
Works: 1) All new notices shown on "Invites" tab of new floater "NOTIFICATIONS TABBED" in condensed view To be done: 1) Show other types of notices, like transactions and system 2) Separate notices between tabs "Invites", "System", "Transactions" 3) Design full notice view (in addition to condensed view)
Diffstat (limited to 'indra/newview/llchicletbar.cpp')
-rwxr-xr-xindra/newview/llchicletbar.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llchicletbar.cpp b/indra/newview/llchicletbar.cpp
index 28e367fbe1..45510d0824 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
{
@@ -59,7 +60,8 @@ BOOL LLChicletBar::postBuild()
mToolbarStack = getChild<LLLayoutStack>("toolbar_stack");
mChicletPanel = getChild<LLChicletPanel>("chiclet_list");
- showWellButton("notification_well", !LLNotificationWellWindow::getInstance()->isWindowEmpty());
+ //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));