summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorKitty Barnett <none@none>2012-01-25 07:41:08 -0500
committerKitty Barnett <none@none>2012-01-25 07:41:08 -0500
commitd264b5b9233650f2bf8668514b9a5f14c9f6fcfe (patch)
tree8ddde6ee58cd8982b467befadc809fb1862649ee /indra
parentdbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff)
STORM-1804 Details... button on PERMISSION_DEBIT dialog triggers run_time_permissions() with a deny action
With help from Jonathan Yap
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llviewermessage.cpp18
1 files changed, 10 insertions, 8 deletions
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);