diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-02-09 11:54:31 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-02-09 11:54:31 -0500 |
| commit | 381d5829db58412dca9abe30137f1e3796420b72 (patch) | |
| tree | be5e1c32c629677f26c67793777e820e53e2bbba | |
| parent | cb6fe4b4e9bfdec62bd1c1669838c9f344efe253 (diff) | |
| parent | d264b5b9233650f2bf8668514b9a5f14c9f6fcfe (diff) | |
merge changes for storm-1804
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 18 |
2 files changed, 12 insertions, 8 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 6c6f68faad..c1306db9b7 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -604,6 +604,7 @@ Jonathan Yap STORM-1712 STORM-1728 STORM-1736 + STORM-1804 STORM-1734 STORM-1731 STORM-653 @@ -651,6 +652,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 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); |