Second Life viewer sources 1.23.1-RC

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&
         LLSD element;
         element["type"] = type;
         element["name"] = name;
-        element["label"] = name;
+        element["text"] = name;
         element["value"] = value;
         element["index"] = mFormData.size();
         mFormData.append(element);
@@ -525,7 +525,12 @@ std::string LLNotification::getSelectedOptionName(const LLSD& response)
 void LLNotification::respond(const LLSD& response)
 {
         mRespondedTo = true;
-        LLNotificationFunctorRegistry::instance().getFunctor(mResponseFunctorName)(asLLSD(), response);
+        // look up the functor
+        LLNotificationFunctorRegistry::ResponseFunctor functor = 
+                LLNotificationFunctorRegistry::instance().getFunctor(mResponseFunctorName);
+        // and then call it
+        functor(asLLSD(), response);
+        
         if (mTemporaryResponder)
         {
                 LLNotificationFunctorRegistry::instance().unregisterFunctor(mResponseFunctorName);