diff options
Diffstat (limited to 'indra/llxuixml')
| -rw-r--r-- | indra/llxuixml/llinitparam.cpp | 4 | ||||
| -rw-r--r-- | indra/llxuixml/llinitparam.h | 2 | ||||
| -rw-r--r-- | indra/llxuixml/llxuiparser.cpp | 4 | 
3 files changed, 5 insertions, 5 deletions
| diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index bf2de9360a..fcdbaa4309 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -313,10 +313,10 @@ namespace LLInitParam  		}  		// if no match, and no names left on stack, this is just an existence assertion of this block -		// verify by calling readValue with NoValue type, an inherently unparseable type +		// verify by calling readValue with NoParamValue type, an inherently unparseable type  		if (!names_left)  		{ -			NoValue no_value; +			NoParamValue no_value;  			return p.readValue(no_value);  		} diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 66ef8e65cd..1f9045754a 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -279,7 +279,7 @@ namespace LLInitParam  	};  	// used to indicate no matching value to a given name when parsing -	struct NoValue{}; +	struct NoParamValue{};  	class BaseBlock; diff --git a/indra/llxuixml/llxuiparser.cpp b/indra/llxuixml/llxuiparser.cpp index 723a20f382..b321eaf7a6 100644 --- a/indra/llxuixml/llxuiparser.cpp +++ b/indra/llxuixml/llxuiparser.cpp @@ -382,7 +382,7 @@ LLXUIParser::LLXUIParser()  {  	if (sXUIReadFuncs.empty())  	{ -		registerParserFuncs<LLInitParam::NoValue>(readNoValue, writeNoValue); +		registerParserFuncs<LLInitParam::NoParamValue>(readNoValue, writeNoValue);  		registerParserFuncs<bool>(readBoolValue, writeBoolValue);  		registerParserFuncs<std::string>(readStringValue, writeStringValue);  		registerParserFuncs<U8>(readU8Value, writeU8Value); @@ -1078,7 +1078,7 @@ LLSimpleXUIParser::LLSimpleXUIParser(LLSimpleXUIParser::element_start_callback_t  {  	if (sSimpleXUIReadFuncs.empty())  	{ -		registerParserFuncs<LLInitParam::NoValue>(readNoValue); +		registerParserFuncs<LLInitParam::NoParamValue>(readNoValue);  		registerParserFuncs<bool>(readBoolValue);  		registerParserFuncs<std::string>(readStringValue);  		registerParserFuncs<U8>(readU8Value); | 
