Merge with viewer-2.0.0-3 branch

1 files changed, 7 insertions, 3 deletions

diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 569112aef1..452f18b40b 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -314,7 +314,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);
@@ -541,8 +541,12 @@ std::string LLNotification::getSelectedOptionName(const LLSD& response)
 void LLNotification::respond(const LLSD& response)
 {
 	mRespondedTo = true;
-	LLNotificationResponder func = LLNotificationFunctorRegistry::instance().getFunctor(mResponseFunctorName);
-	func(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);