From 770538f992a42cdda091f93e8b318e35372aaad2 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 1 Dec 2011 10:42:15 -0800
Subject: Build fixes for mac, hopefully Linux too

---
 indra/llxuixml/llinitparam.h   |  2 +-
 indra/llxuixml/llxuiparser.cpp | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'indra/llxuixml')

diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index 7927f84cba..ab20957760 100644
--- a/indra/llxuixml/llinitparam.h
+++ b/indra/llxuixml/llinitparam.h
@@ -764,7 +764,7 @@ namespace LLInitParam
 		{
 			if (NAME_VALUE_LOOKUP::getValueFromName(val, mValue))
 			{
-				setValueName(val);
+				NAME_VALUE_LOOKUP::setValueName(val);
 			}
 			else
 			{
diff --git a/indra/llxuixml/llxuiparser.cpp b/indra/llxuixml/llxuiparser.cpp
index 90c2671242..58654dcc21 100644
--- a/indra/llxuixml/llxuiparser.cpp
+++ b/indra/llxuixml/llxuiparser.cpp
@@ -129,7 +129,7 @@ struct Any : public LLInitParam::Block<Any, Occurs>
 
 struct All : public LLInitParam::Block<All, Occurs>
 {
-	Multiple<Lazy<Element>> elements;
+	Multiple< Lazy<Element> > elements;
 
 	All()
 	:	elements("element")
@@ -140,11 +140,11 @@ struct All : public LLInitParam::Block<All, Occurs>
 
 struct Choice : public LLInitParam::ChoiceBlock<Choice, Occurs>
 {
-	Alternative<Lazy<Element>>	element;
-	Alternative<Lazy<Group>>	group;
-	Alternative<Lazy<Choice>>	choice;
-	Alternative<Lazy<Sequence>>	sequence;
-	Alternative<Lazy<Any>>		any;
+	Alternative< Lazy<Element> >	element;
+	Alternative< Lazy<Group> >		group;
+	Alternative< Lazy<Choice> >		choice;
+	Alternative< Lazy<Sequence> >	sequence;
+	Alternative< Lazy<Any> >		any;
 
 	Choice()
 	:	element("element"),
@@ -158,11 +158,11 @@ struct Choice : public LLInitParam::ChoiceBlock<Choice, Occurs>
 
 struct Sequence : public LLInitParam::ChoiceBlock<Sequence, Occurs>
 {
-	Alternative<Lazy<Element>>	element;
-	Alternative<Lazy<Group>>	group;
-	Alternative<Lazy<Choice>>	choice;
-	Alternative<Lazy<Sequence>>	sequence;
-	Alternative<Lazy<Any>>		any;
+	Alternative< Lazy<Element> >	element;
+	Alternative< Lazy<Group> >		group;
+	Alternative< Lazy<Choice> >		choice;
+	Alternative< Lazy<Sequence> >	sequence;
+	Alternative< Lazy<Any> >		any;
 };
 
 struct GroupContents : public LLInitParam::ChoiceBlock<GroupContents, Occurs>
@@ -247,7 +247,7 @@ struct ComplexType : public LLInitParam::Block<ComplexType, ComplexTypeContents>
 	Optional<bool>					mixed;
 
 	Multiple<Attribute>				attribute;
-	Multiple<Lazy<Element>>			elements;
+	Multiple< Lazy<Element> >			elements;
 
 	ComplexType()
 	:	name("name"),
-- 
cgit v1.2.3