diff -r 3f2162768b29 -r 5d0c4ae348ec doc/contributions.txt --- a/doc/contributions.txt Mon Dec 12 10:03:06 2011 -0500 +++ b/doc/contributions.txt Wed Jan 25 07:41:08 2012 -0500 @@ -595,6 +595,7 @@ STORM-1719 STORM-1712 STORM-1728 + STORM-1804 Kadah Coba STORM-1060 Jondan Lundquist @@ -630,6 +631,7 @@ STORM-1001 STORM-1175 VWR-24217 + STORM-1804 Kolor Fall Komiko Okamoto Korvel Noh diff -r 3f2162768b29 -r 5d0c4ae348ec indra/newview/llviewermessage.cpp --- a/indra/newview/llviewermessage.cpp Mon Dec 12 10:03:06 2011 -0500 +++ b/indra/newview/llviewermessage.cpp Wed Jan 25 07:41:08 2012 -0500 @@ -5786,6 +5786,16 @@ 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 @@ 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);