1 files changed, 9 insertions, 30 deletions

diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp
index 4c050844f8..2ead5a4a57 100644
--- a/indra/llxuixml/llinitparam.cpp
+++ b/indra/llxuixml/llinitparam.cpp
@@ -84,8 +84,8 @@ namespace LLInitParam
 	// BaseBlock
 	//
 	BaseBlock::BaseBlock()
-	:	mLastChangedParam(0),
-		mChangeVersion(0)
+	:	mChangeVersion(0),
+		mBlockDescriptor(NULL)
 	{}
 
 	BaseBlock::~BaseBlock()
@@ -137,7 +137,7 @@ namespace LLInitParam
 	}
 
 
-	bool BaseBlock::validateBlock(bool silent) const
+	bool BaseBlock::validateBlock(bool emit_errors) const
 	{
 		const BlockDescriptor& block_data = getBlockDescriptor();
 		for (BlockDescriptor::param_validation_list_t::const_iterator it = block_data.mValidationList.begin(); it != block_data.mValidationList.end(); ++it)
@@ -145,7 +145,7 @@ namespace LLInitParam
 			const Param* param = getParamFromHandle(it->first);
 			if (!it->second(param))
 			{
-				if (!silent)
+				if (emit_errors)
 				{
 					llwarns << "Invalid param \"" << getParamName(block_data, param) << "\"" << llendl;
 				}
@@ -347,7 +347,6 @@ namespace LLInitParam
 
 			if (deserialize_func && deserialize_func(*paramp, p, name_stack, name_stack.first == name_stack.second ? -1 : name_stack.first->second))
 			{
-				mLastChangedParam = (*it)->mParamHandle;
 				return true;
 			}
 		}
@@ -416,9 +415,11 @@ namespace LLInitParam
 
 	void BaseBlock::setLastChangedParam(const Param& last_param, bool user_provided)
 	{ 
-		mLastChangedParam = getHandleFromParam(&last_param); 
+		if (user_provided)
+		{
 		mChangeVersion++;
 	}
+	}
 
 	const std::string& BaseBlock::getParamName(const BlockDescriptor& block_data, const Param* paramp) const
 	{
@@ -457,28 +458,7 @@ namespace LLInitParam
 
 	// take all provided params from other and apply to self
 	// NOTE: this requires that "other" is of the same derived type as this
-	bool BaseBlock::overwriteFromImpl(BlockDescriptor& block_data, const BaseBlock& other)
-	{
-		bool param_changed = false;
-		BlockDescriptor::all_params_list_t::const_iterator end_it = block_data.mAllParams.end();
-		for (BlockDescriptor::all_params_list_t::const_iterator it = block_data.mAllParams.begin();
-			it != end_it;
-			++it)
-		{
-			const Param* other_paramp = other.getParamFromHandle(it->mParamHandle);
-			ParamDescriptor::merge_func_t merge_func = it->mMergeFunc;
-			if (merge_func)
-			{
-				Param* paramp = getParamFromHandle(it->mParamHandle);
-				param_changed |= merge_func(*paramp, *other_paramp, true);
-				mLastChangedParam = it->mParamHandle;
-			}
-		}
-		return param_changed;
-	}
-
-	// take all provided params that are not already provided, and apply to self
-	bool BaseBlock::fillFromImpl(BlockDescriptor& block_data, const BaseBlock& other)
+	bool BaseBlock::merge(BlockDescriptor& block_data, const BaseBlock& other, bool overwrite)
 	{
 		bool param_changed = false;
 		BlockDescriptor::all_params_list_t::const_iterator end_it = block_data.mAllParams.end();
@@ -491,8 +471,7 @@ namespace LLInitParam
 			if (merge_func)
 			{
 				Param* paramp = getParamFromHandle(it->mParamHandle);
-				param_changed |= merge_func(*paramp, *other_paramp, false);
-				mLastChangedParam = it->mParamHandle;
+				param_changed |= merge_func(*paramp, *other_paramp, overwrite);
 			}
 		}
 		return param_changed;