merge from viewer-pre-release

1 files changed, 25 insertions, 18 deletions

diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index 35c889b69f..194ef8af6a 100644
--- a/indra/llxuixml/llinitparam.h
+++ b/indra/llxuixml/llinitparam.h
@@ -740,7 +740,6 @@ namespace LLInitParam
 			if (src_typed_param.isProvided()
 				&& (overwrite || !dst_typed_param.isProvided()))
 			{
-				dst_typed_param.clearValueName();
 				dst_typed_param.set(src_typed_param.getValue());
 				return true;
 			}
@@ -1744,39 +1743,35 @@ namespace LLInitParam
 		:	mValue(value),
 			mValueAge(VALUE_AUTHORITATIVE),
 			mKeyVersion(0),
-			mValidatedVersion(-1)
+			mValidatedVersion(-1),
+			mValidated(false)
 		{}
 
 		bool deserializeBlock(Parser& parser, Parser::name_stack_range_t name_stack, S32 generation)
 		{
 			derived_t& typed_param = static_cast<derived_t&>(*this);
-			// type to apply parse direct value T
+			// try to parse direct value T
 			if (name_stack.first == name_stack.second)
 			{
 				if(parser.readValue(typed_param.mValue))
 				{
-					typed_param.clearValueName();
 					typed_param.mValueAge = VALUE_AUTHORITATIVE;
-					typed_param.updateBlockFromValue();
+					typed_param.updateBlockFromValue(false);
+
+					typed_param.clearValueName();
 
 					return true;
 				}
 			}
 
 			// fall back on parsing block components for T
-			// if we deserialized at least one component...
-			if (typed_param.BaseBlock::deserializeBlock(parser, name_stack, generation))
-			{
-				return true;
-			}
-
-			return false;
+			return typed_param.BaseBlock::deserializeBlock(parser, name_stack, generation);
 		}
 
 		void serializeBlock(Parser& parser, Parser::name_stack_t name_stack = Parser::name_stack_t(), const BaseBlock* diff_block = NULL) const
 		{
-			const self_t& typed_param = static_cast<const self_t&>(*this);
-			const self_t* diff_param = static_cast<const self_t*>(diff_block);
+			const derived_t& typed_param = static_cast<const derived_t&>(*this);
+			const derived_t* diff_param = static_cast<const derived_t*>(diff_block);
 			
 			std::string key = typed_param.getValueName();
 
@@ -1801,7 +1796,20 @@ namespace LLInitParam
 					// be exported as <color green="1"/>, since it was probably the intent of the user to 
 					// be specific about the RGB color values.  This also fixes an issue where we distinguish
 					// between rect.left not being provided and rect.left being explicitly set to 0 (same as default)
-					block_t::serializeBlock(parser, name_stack, NULL);
+
+					if (typed_param.mValueAge == VALUE_AUTHORITATIVE)
+					{
+						// if the value is authoritative but the parser doesn't accept the value type
+						// go ahead and make a copy, and splat the value out to its component params
+						// and serialize those params
+						derived_t copy(typed_param);
+						copy.updateBlockFromValue(true);
+						copy.block_t::serializeBlock(parser, name_stack, NULL);
+					}
+					else
+					{
+						block_t::serializeBlock(parser, name_stack, NULL);
+					}
 				}
 			}
 		}
@@ -1850,7 +1858,7 @@ namespace LLInitParam
 		{ 
 			BaseBlock::paramChanged(changed_param, user_provided);
 			if (user_provided)
-		{
+			{
 				// a parameter changed, so our value is out of date
 				mValueAge = VALUE_NEEDS_UPDATE;
 			}
@@ -1863,7 +1871,7 @@ namespace LLInitParam
 			mValueAge = VALUE_AUTHORITATIVE;
 			mValue = val;
 			typed_param.clearValueName();
-			static_cast<derived_t*>(const_cast<self_t*>(this))->updateBlockFromValue();
+			static_cast<derived_t*>(this)->updateBlockFromValue(false);
 		}
 
 		value_assignment_t getValue() const
@@ -1918,7 +1926,6 @@ namespace LLInitParam
 		mutable bool 		mValidated; // lazy validation flag
 
 	private:
-
 		mutable T			mValue;
 		mutable EValueAge	mValueAge;
 	};