livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more robustness for empty-but-not-aborted textboxes.

master
Tofu Linden 2010-09-29 19:00:55 +01:00
parent f7f3df3a2c
commit ca18210485
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/lltoastscripttextbox.cpp
View File

@ -171,6 +171,12 @@ void LLToastScriptTextbox::onClickOk()
LLSD response = mNotification->getResponseTemplate();
//response["OH MY GOD WHAT A HACK"] = "woot";
response[TEXTBOX_MAGIC_TOKEN] = pMessageText->getText();
if (response[TEXTBOX_MAGIC_TOKEN].asString().empty())
{
// so we can distinguish between a successfully
// submitted blank textbox, and an ignored toast
response[TEXTBOX_MAGIC_TOKEN] = true;
}
mNotification->respond(response);
close();
llwarns << response << llendl;

5
indra/newview/llviewermessage.cpp
View File

@ -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"