Skip to content

Commit a4bd6cc

Browse files
author
Rye Cogtail
committed
Fix leak of notification seperator in tabbed notification floater
1 parent ac8d8aa commit a4bd6cc

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

indra/newview/llfloaternotificationstabbed.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ LLFloaterNotificationsTabbed::LLFloaterNotificationsTabbed(const LLSD& key) : LL
4545
mGroupNoticeMessageList(NULL),
4646
mTransactionMessageList(NULL),
4747
mSystemMessageList(NULL),
48-
mNotificationsSeparator(NULL),
4948
mNotificationsTabContainer(NULL),
5049
NOTIFICATION_TABBED_ANCHOR_NAME("notification_well_panel"),
5150
IM_WELL_ANCHOR_NAME("im_well_panel"),
@@ -54,7 +53,7 @@ LLFloaterNotificationsTabbed::LLFloaterNotificationsTabbed(const LLSD& key) : LL
5453
{
5554
setOverlapsScreenChannel(true);
5655
mNotificationUpdates.reset(new NotificationTabbedChannel(this));
57-
mNotificationsSeparator = new LLNotificationSeparator();
56+
mNotificationsSeparator = std::make_unique<LLNotificationSeparator>();
5857
}
5958

6059
//---------------------------------------------------------------------------------
@@ -117,6 +116,7 @@ void LLFloaterNotificationsTabbed::setSysWellChiclet(LLSysWellChiclet* chiclet)
117116
//---------------------------------------------------------------------------------
118117
LLFloaterNotificationsTabbed::~LLFloaterNotificationsTabbed()
119118
{
119+
mNotificationsSeparator.reset();
120120
}
121121

122122
//---------------------------------------------------------------------------------

indra/newview/llfloaternotificationstabbed.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class LLFloaterNotificationsTabbed : public LLTransientDockableFloater
162162
LLNotificationListView* mGroupNoticeMessageList;
163163
LLNotificationListView* mTransactionMessageList;
164164
LLNotificationListView* mSystemMessageList;
165-
LLNotificationSeparator* mNotificationsSeparator;
165+
std::unique_ptr<LLNotificationSeparator> mNotificationsSeparator;
166166
LLTabContainer* mNotificationsTabContainer;
167167
LLButton* mDeleteAllBtn;
168168
LLButton* mCollapseAllBtn;

0 commit comments

Comments
 (0)