summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 321100e140..3a8f76aca1 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6179,15 +6179,14 @@ bool callback_script_dialog(const LLSD& notification, const LLSD& response)
llwarns << "ok: " << response << llendl;
std::string rtn_text;
S32 button_idx;
- if (response[TEXTBOX_MAGIC_TOKEN].isDefined())
+ button_idx = LLNotification::getSelectedOption(notification, response);
+ if (response[TEXTBOX_MAGIC_TOKEN].isString())
{
rtn_text = response[TEXTBOX_MAGIC_TOKEN].asString();
- button_idx = 0;
}
else
{
rtn_text = LLNotification::getSelectedOptionName(response);
- button_idx = LLNotification::getSelectedOption(notification, response);
}
llwarns << "rtn: " << rtn_text << " btnidx: " << button_idx << llendl;
// Didn't click "Ignore"