diff options
author | Oz Linden <oz@lindenlab.com> | 2012-02-06 15:51:54 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-02-06 15:51:54 -0500 |
commit | df5b1ed85bef99c4a1e9162f413339b2efafe88e (patch) | |
tree | 27ab99556caa3b2dcc035bc4669b3033521961b0 /indra/newview | |
parent | 5b8bcee234dace3af19d86472f49f81bc765db72 (diff) | |
parent | d264b5b9233650f2bf8668514b9a5f14c9f6fcfe (diff) |
merge changes for storm-1804
Diffstat (limited to 'indra/newview')
-rwxr-xr-x | indra/newview/llviewermessage.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 3c6770df43..2a584d6ed7 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5816,6 +5816,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 @@ -5873,14 +5883,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); |