From f4edcdd4090cb6704603d5ef0dc8cf7a3f67399e Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Thu, 17 May 2012 21:02:53 +0300
Subject: MAINT-938 FIXED (Make debit-permissions dialog give a stronger
 warning)

- Added new tag called "footer" to the notification. This tag allows to display messages under the buttons in toasts.
- Created new class LLToastScriptQuestion for the "ScriptQuestionCaution" notification. This notification supports tag <footer>.
---
 indra/llui/llnotifications.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/llui/llnotifications.cpp')

diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 8aa548b974..1dc657f915 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -399,6 +399,7 @@ LLNotificationTemplate::LLNotificationTemplate(const LLNotificationTemplate::Par
 :	mName(p.name),
 	mType(p.type),
 	mMessage(p.value),
+	mFooter(p.footer.value),
 	mLabel(p.label),
 	mIcon(p.icon),
 	mURL(p.url.value),
@@ -870,6 +871,15 @@ std::string LLNotification::getMessage() const
 	return message;
 }
 
+std::string LLNotification::getFooter() const
+{
+	if (!mTemplatep)
+		return std::string();
+
+	std::string message = mTemplatep->mFooter;
+	return message;
+}
+
 std::string LLNotification::getLabel() const
 {
 	std::string label = mTemplatep->mLabel;
-- 
cgit v1.2.3


From d9cf4691a7369004a1ceeb11ca8d3262648c05e7 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 18 May 2012 21:01:10 +0300
Subject: MAINT-938 ADDITIONAL FIX (Make debit-permissions dialog give a
 stronger warning)

- Requested permissions are added dynamically to the dialog's footer
- And the footer is not shown when it is empty
---
 indra/llui/llnotifications.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/llui/llnotifications.cpp')

diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 1dc657f915..09480968a6 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -876,8 +876,9 @@ std::string LLNotification::getFooter() const
 	if (!mTemplatep)
 		return std::string();
 
-	std::string message = mTemplatep->mFooter;
-	return message;
+	std::string footer = mTemplatep->mFooter;
+	LLStringUtil::format(footer, mSubstitutions);
+	return footer;
 }
 
 std::string LLNotification::getLabel() const
-- 
cgit v1.2.3