diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-29 17:03:05 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-29 17:03:05 +0100 |
| commit | 42ed8e8ffadd6bd7d8784084e9a29badf5d75c5c (patch) | |
| tree | a7c3f576bc8838bb5f7587502cc9e01d48231542 | |
| parent | 921d6187073afa3e76e05395ddb8a64f9f479d68 (diff) | |
response is starting to limp along.
| -rw-r--r-- | indra/newview/lltoastnotifypanel.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/lltoastscripttextbox.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index 51f32331d8..45c031964c 100644 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -527,6 +527,7 @@ void LLToastNotifyPanel::onClickButton(void* data) self->mNotification->setResponder(new_info); } + llwarns << response << llendl; self->mNotification->respond(response); if(is_reusable) diff --git a/indra/newview/lltoastscripttextbox.cpp b/indra/newview/lltoastscripttextbox.cpp index a9f8272ea9..2a0d971a44 100644 --- a/indra/newview/lltoastscripttextbox.cpp +++ b/indra/newview/lltoastscripttextbox.cpp @@ -161,13 +161,15 @@ void LLToastScriptTextbox::close() die(); } +#include "lllslconstants.h" void LLToastScriptTextbox::onClickOk() { LLSD response = mNotification->getResponseTemplate(); - response["OH MY GOD WHAT A HACK"] = true; + //response["OH MY GOD WHAT A HACK"] = "woot"; + response[TEXTBOX_MAGIC_TOKEN] = "ffffffffuuuuu"; mNotification->respond(response); close(); - //llerrs << response << llendl; + llwarns << response << llendl; } /* void LLToastScriptTextbox::onClickAttachment() diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 26b7e0fb6d..b78c7b3d66 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -6171,10 +6171,14 @@ const S32 SCRIPT_DIALOG_BUTTON_STR_SIZE = 24; const S32 SCRIPT_DIALOG_MAX_MESSAGE_SIZE = 512; const char* SCRIPT_DIALOG_HEADER = "Script Dialog:\n"; +#include "lllslconstants.h" bool callback_script_dialog(const LLSD& notification, const LLSD& response) { LLNotificationForm form(notification["form"]); - std::string button = LLNotification::getSelectedOptionName(response); + //std::string button = "booya";//LLNotification::getSelectedOptionName(response); + std::string button = response[TEXTBOX_MAGIC_TOKEN].asString().empty() ? + LLNotification::getSelectedOptionName(response) : + response[TEXTBOX_MAGIC_TOKEN].asString(); S32 button_idx = LLNotification::getSelectedOption(notification, response); // Didn't click "Ignore" if (button_idx != -1) |