From 86609394caf1ebb20dd90de37b9af1471ae8aa20 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Fri, 29 Jan 2010 17:48:10 +0200
Subject: =?UTF-8?q?fixed=20major=20EXT-3643=20=E2=80=9CEmbed=20friendship?=
 =?UTF-8?q?=20offer=20into=20IM=20window=E2=80=9D;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/lltoastnotifypanel.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/lltoastnotifypanel.cpp')

diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index 94acb2ae8c..4d741456c4 100644
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -43,6 +43,7 @@
 #include "lluiconstants.h"
 #include "llrect.h"
 #include "lltrans.h"
+#include "llnotificationsutil.h"
 
 const S32 BOTTOM_PAD = VPAD * 3;
 S32 BUTTON_WIDTH = 90;
@@ -235,6 +236,10 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, BOOL is_opt
 LLToastNotifyPanel::~LLToastNotifyPanel() 
 {
 	std::for_each(mBtnCallbackData.begin(), mBtnCallbackData.end(), DeletePointer());
+	if (LLNotificationsUtil::find(mNotification->getID()) != NULL)
+	{
+		LLNotifications::getInstance()->cancel(mNotification);
+	}
 }
 void LLToastNotifyPanel::updateButtonsLayout(const std::vector<index_button_pair_t>& buttons, S32 left_pad, S32 top)
 {
-- 
cgit v1.2.3