Fix invalid name in notification channel

indra/newview/llfloaternotificationstabbed.cpp

@@ -52,7 +52,6 @@ LLFloaterNotificationsTabbed::LLFloaterNotificationsTabbed(const LLSD& key) : LL
 
 {
     setOverlapsScreenChannel(true);
-    mNotificationUpdates.reset(new NotificationTabbedChannel(this));
     mNotificationsSeparator = std::make_unique<LLNotificationSeparator>();
 }
 
@@ -63,6 +62,7 @@ BOOL LLFloaterNotificationsTabbed::postBuild()
     mGroupNoticeMessageList = getChild<LLNotificationListView>("group_notice_notification_list");
     mTransactionMessageList = getChild<LLNotificationListView>("transaction_notification_list");
     mSystemMessageList = getChild<LLNotificationListView>("system_notification_list");
+    mNotificationsSeparator = std::make_unique<LLNotificationSeparator>();
     mNotificationsSeparator->initTaggedList(LLNotificationListItem::getGroupInviteTypes(), mGroupInviteMessageList);
     mNotificationsSeparator->initTaggedList(LLNotificationListItem::getGroupNoticeTypes(), mGroupNoticeMessageList);
     mNotificationsSeparator->initTaggedList(LLNotificationListItem::getTransactionTypes(), mTransactionMessageList);
@@ -76,6 +76,7 @@ BOOL LLFloaterNotificationsTabbed::postBuild()
     mCollapseAllBtn->setClickedCallback(boost::bind(&LLFloaterNotificationsTabbed::onClickCollapseAllBtn,this));
 
     // get a corresponding channel
+    mNotificationUpdates.reset(new NotificationTabbedChannel(this));
     initChannel();
     BOOL rv = LLTransientDockableFloater::postBuild();
     
@@ -231,7 +232,7 @@ bool LLFloaterNotificationsTabbed::isWindowEmpty()
 
 //---------------------------------------------------------------------------------
 LLFloaterNotificationsTabbed::NotificationTabbedChannel::NotificationTabbedChannel(LLFloaterNotificationsTabbed* notifications_tabbed_window)
-    : LLNotificationChannel(LLNotificationChannel::Params().name(notifications_tabbed_window->getPathname())),
+    : LLNotificationChannel(LLNotificationChannel::Params().name(notifications_tabbed_window->getName())),
     mNotificationsTabbedWindow(notifications_tabbed_window)
 {
     connectToChannel("Notifications");

indra/newview/lllegacynotificationwellwindow.cpp

@@ -34,7 +34,7 @@
 #include "lltoastpanel.h"
 
 LLLegacyNotificationWellWindow::WellNotificationChannel::WellNotificationChannel(LLLegacyNotificationWellWindow* well_window)
-:	LLNotificationChannel(LLNotificationChannel::Params().name(well_window->getPathname()))
+:	LLNotificationChannel(LLNotificationChannel::Params().name(well_window->getName()))
 ,	mWellWindow(well_window)
 {
 	connectToChannel("Notifications");
@@ -45,7 +45,6 @@ LLLegacyNotificationWellWindow::WellNotificationChannel::WellNotificationChannel
 LLLegacyNotificationWellWindow::LLLegacyNotificationWellWindow(const LLSD& key)
 :	LLSysWellWindow(key)
 {
-	mNotificationUpdates.reset(new WellNotificationChannel(this));
 }
 
 // static
@@ -57,6 +56,8 @@ LLLegacyNotificationWellWindow* LLLegacyNotificationWellWindow::getInstance(cons
 // virtual
 BOOL LLLegacyNotificationWellWindow::postBuild()
 {
+	mNotificationUpdates.reset(new WellNotificationChannel(this));
+
 	BOOL rv = LLSysWellWindow::postBuild();
 	setTitle(getString("title_notification_well_window"));
 	return rv;