Merge

1 files changed, 16 insertions, 1 deletions

diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp
index c21e4ff7e8..fd03efa061 100755
--- a/indra/newview/llfloaternotificationsconsole.cpp
+++ b/indra/newview/llfloaternotificationsconsole.cpp
@@ -41,6 +41,7 @@ class LLNotificationChannelPanel : public LLLayoutPanel
 {
 public:
 	LLNotificationChannelPanel(const Params& p);
+	~LLNotificationChannelPanel();
 	BOOL postBuild();
 
 private:
@@ -57,6 +58,20 @@ LLNotificationChannelPanel::LLNotificationChannelPanel(const LLNotificationChann
 	buildFromFile( "panel_notifications_channel.xml");
 }
 
+LLNotificationChannelPanel::~LLNotificationChannelPanel()
+{
+	// Userdata for all records is a LLNotification* we need to clean up
+	std::vector<LLScrollListItem*> data_list = getChild<LLScrollListCtrl>("notifications_list")->getAllData();
+	std::vector<LLScrollListItem*>::iterator data_itor;
+	for (data_itor = data_list.begin(); data_itor != data_list.end(); ++data_itor)
+	{
+		LLScrollListItem* item = *data_itor;
+		LLNotification* notification = (LLNotification*)item->getUserdata();
+		delete notification;
+		notification = NULL;
+	}
+}
+
 BOOL LLNotificationChannelPanel::postBuild()
 {
 	LLButton* header_button = getChild<LLButton>("header");
@@ -124,7 +139,7 @@ bool LLNotificationChannelPanel::update(const LLSD& payload)
 		row["columns"][2]["type"] = "date";
 
 		LLScrollListItem* sli = getChild<LLScrollListCtrl>("notifications_list")->addElement(row);
-		sli->setUserdata(&(*notification));
+		sli->setUserdata(new LLNotification(notification->asLLSD()));
 	}
 
 	return false;