Merge with render-pipeline

1 files changed, 4 insertions, 7 deletions

diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index 089163929e..38f67720b7 100644
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -291,7 +291,10 @@ LLToastNotifyPanel::~LLToastNotifyPanel()
 	{
 		// let reusable notification be deleted
 		mNotification->setReusable(false);
-		LLNotifications::getInstance()->cancel(mNotification);
+		if (!mNotification->isPersistent())
+		{
+			LLNotifications::getInstance()->cancel(mNotification);
+		}
 	}
 }
 
@@ -492,12 +495,6 @@ void LLToastNotifyPanel::onClickButton(void* data)
 	if(is_reusable)
 	{
 		sButtonClickSignal(self->mNotification->getID(), button_name);
-
-		if(new_info && !self->mNotification->isPersistent())
-		{
-			self->mNotification->setResponseFunctor(
-				boost::bind(&LLOfferInfo::inventory_offer_callback, new_info, _1, _2));
-		}
 	}
 	else
 	{