From 8f51615aa7c8cab8137c82e89446928e3632dc74 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 16 Sep 2010 00:41:27 -0700 Subject: fixed serialization of choice blocks sometimes including more than one alternative fixed deserialization of Multiple leaving dummy blocks around when failing to find matching key --- indra/llxuixml/llinitparam.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llxuixml/llinitparam.cpp') diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index 7b6be55ec7..dc4d93d38a 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -178,7 +178,7 @@ namespace LLInitParam param_handle_t param_handle = it->second->mParamHandle; const Param* param = getParamFromHandle(param_handle); ParamDescriptor::serialize_func_t serialize_func = it->second->mSerializeFunc; - if (serialize_func) + if (serialize_func && param->getProvided()) { // Ensure this param has not already been serialized // Prevents from being serialized as its own tag. -- cgit v1.3