From b1099e21600c8d2c4584ef8f3696ddc5f42c936b Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 9 Feb 2010 17:19:26 -0800
Subject: fix for invalid param 'name' warnings

---
 indra/llui/llui.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index 5840e76f5c..af8d4ea03b 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -426,8 +426,8 @@ namespace LLInitParam
 	{
         typedef BlockValue<const LLFontGL*> super_t;
 	public:
-		Mandatory<std::string>	name;
-		Optional<std::string>	size,
+		Optional<std::string>	name,
+								size,
 								style;
 
 		TypedParam(BlockDescriptor& descriptor, const char* name, const LLFontGL* const value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count);
-- 
cgit v1.2.3


From 7c86d4434822d7a3172bed82c3812032089c1518 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 12 Feb 2010 17:08:10 -0800
Subject: potential fix for bad font names

---
 indra/llui/llui.cpp    | 10 ++++++++--
 indra/llui/lluiimage.h |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 76f07373b4..9d5953e380 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -1894,7 +1894,9 @@ namespace LLInitParam
 		blue("blue"),
 		alpha("alpha"),
 		control("")
-	{}
+	{
+		setBlockFromValue();
+	}
 
 	void TypedParam<LLUIColor>::setValueFromBlock() const
 	{
@@ -1940,6 +1942,7 @@ namespace LLInitParam
 		style("style")
 	{
 		addSynonym(name, "");
+		setBlockFromValue();
 	}
 
 	void TypedParam<const LLFontGL*>::setValueFromBlock() const
@@ -1979,7 +1982,9 @@ namespace LLInitParam
 		bottom("bottom"),
 		width("width"),
 		height("height")
-	{}
+	{
+		setBlockFromValue();
+	}
 
 	void TypedParam<LLRect>::setValueFromBlock() const
 	{
@@ -2064,6 +2069,7 @@ namespace LLInitParam
 		x("x"),
 		y("y")
 	{
+		setBlockFromValue();
 	}
 
 	void TypedParam<LLCoordGL>::setValueFromBlock() const
diff --git a/indra/llui/lluiimage.h b/indra/llui/lluiimage.h
index bdfc44262d..4ea0738026 100644
--- a/indra/llui/lluiimage.h
+++ b/indra/llui/lluiimage.h
@@ -109,6 +109,7 @@ namespace LLInitParam
 		TypedParam(BlockDescriptor& descriptor, const char* name, super_t::value_assignment_t value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count)
 		:	super_t(descriptor, name, value, func, min_count, max_count)
 		{
+			setBlockFromValue();
 		}
 
 		void setValueFromBlock() const;
-- 
cgit v1.2.3