summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-09-29 17:20:16 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-09-29 17:20:16 +0100
commit578ee535644931ede7dd74741d905d04d8da7fd6 (patch)
tree3240e639994c15056e63651fdd9fd7231eff5351 /indra/newview/llviewermessage.cpp
parent42ed8e8ffadd6bd7d8784084e9a29badf5d75c5c (diff)
work on response integrity.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index b78c7b3d66..f897f5e733 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6176,9 +6176,9 @@ bool callback_script_dialog(const LLSD& notification, const LLSD& response)
{
LLNotificationForm form(notification["form"]);
//std::string button = "booya";//LLNotification::getSelectedOptionName(response);
- std::string button = response[TEXTBOX_MAGIC_TOKEN].asString().empty() ?
- LLNotification::getSelectedOptionName(response) :
- response[TEXTBOX_MAGIC_TOKEN].asString();
+ std::string button = response.has(TEXTBOX_MAGIC_TOKEN) ?
+ response[TEXTBOX_MAGIC_TOKEN].asString() :
+ LLNotification::getSelectedOptionName(response);
S32 button_idx = LLNotification::getSelectedOption(notification, response);
// Didn't click "Ignore"
if (button_idx != -1)