aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llnotifications.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llui/llnotifications.cpp')
-rw-r--r--linden/indra/llui/llnotifications.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/linden/indra/llui/llnotifications.cpp b/linden/indra/llui/llnotifications.cpp
index 2ae9672..6b7dd0a 100644
--- a/linden/indra/llui/llnotifications.cpp
+++ b/linden/indra/llui/llnotifications.cpp
@@ -310,7 +310,7 @@ void LLNotificationForm::addElement(const std::string& type, const std::string&
310 LLSD element; 310 LLSD element;
311 element["type"] = type; 311 element["type"] = type;
312 element["name"] = name; 312 element["name"] = name;
313 element["label"] = name; 313 element["text"] = name;
314 element["value"] = value; 314 element["value"] = value;
315 element["index"] = mFormData.size(); 315 element["index"] = mFormData.size();
316 mFormData.append(element); 316 mFormData.append(element);
@@ -525,7 +525,12 @@ std::string LLNotification::getSelectedOptionName(const LLSD& response)
525void LLNotification::respond(const LLSD& response) 525void LLNotification::respond(const LLSD& response)
526{ 526{
527 mRespondedTo = true; 527 mRespondedTo = true;
528 LLNotificationFunctorRegistry::instance().getFunctor(mResponseFunctorName)(asLLSD(), response); 528 // look up the functor
529 LLNotificationFunctorRegistry::ResponseFunctor functor =
530 LLNotificationFunctorRegistry::instance().getFunctor(mResponseFunctorName);
531 // and then call it
532 functor(asLLSD(), response);
533
529 if (mTemporaryResponder) 534 if (mTemporaryResponder)
530 { 535 {
531 LLNotificationFunctorRegistry::instance().unregisterFunctor(mResponseFunctorName); 536 LLNotificationFunctorRegistry::instance().unregisterFunctor(mResponseFunctorName);