From d264b5b9233650f2bf8668514b9a5f14c9f6fcfe Mon Sep 17 00:00:00 2001
From: Kitty Barnett <none@none>
Date: Wed, 25 Jan 2012 07:41:08 -0500
Subject: STORM-1804 Details... button on PERMISSION_DEBIT dialog triggers
run_time_permissions() with a deny action With help from Jonathan Yap
---
doc/contributions.txt | 2 ++
indra/newview/llviewermessage.cpp | 18 ++++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 274632a804..8ec9bfb0ab 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -595,6 +595,7 @@ Jonathan Yap
STORM-1719
STORM-1712
STORM-1728
+ STORM-1804
Kadah Coba
STORM-1060
Jondan Lundquist
@@ -630,6 +631,7 @@ Kitty Barnett
STORM-1001
STORM-1175
VWR-24217
+ STORM-1804
Kolor Fall
Komiko Okamoto
Korvel Noh
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index ad333a71ff..2e233b71ce 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5786,6 +5786,16 @@ bool script_question_cb(const LLSD& notification, const LLSD& response)
S32 orig = notification["payload"]["questions"].asInteger();
S32 new_questions = orig;
+ if (response["Details"])
+ {
+ // respawn notification...
+ LLNotificationsUtil::add(notification["name"], notification["substitutions"], notification["payload"]);
+
+ // ...with description on top
+ LLNotificationsUtil::add("DebitPermissionDetails");
+ return false;
+ }
+
// check whether permissions were granted or denied
BOOL allowed = TRUE;
// the "yes/accept" button is the first button in the template, making it button 0
@@ -5843,14 +5853,6 @@ bool script_question_cb(const LLSD& notification, const LLSD& response)
gSavedSettings.getString("NotificationChannelUUID")), OfferMatcher(item_id));
}
- if (response["Details"])
- {
- // respawn notification...
- LLNotificationsUtil::add(notification["name"], notification["substitutions"], notification["payload"]);
-
- // ...with description on top
- LLNotificationsUtil::add("DebitPermissionDetails");
- }
return false;
}
static LLNotificationFunctorRegistration script_question_cb_reg_1("ScriptQuestion", script_question_cb);
--
cgit v1.2.3