diff options
author | Richard Linden <none@none> | 2011-11-16 12:28:10 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2011-11-16 12:28:10 -0800 |
commit | 2ee4bae1a39814467e4bd361211f7836266af880 (patch) | |
tree | bd055ebac3a885b88436b034cb62fbc57beafd3c /indra/llxuixml/llxuiparser.cpp | |
parent | 267e75d8dc36386070ddb3ecebb31a7bbadd6d03 (diff) |
support for assignment of named values to params, works with string-typed params
as well as () operator
Diffstat (limited to 'indra/llxuixml/llxuiparser.cpp')
-rw-r--r-- | indra/llxuixml/llxuiparser.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llxuixml/llxuiparser.cpp b/indra/llxuixml/llxuiparser.cpp index cdf578113a..90c2671242 100644 --- a/indra/llxuixml/llxuiparser.cpp +++ b/indra/llxuixml/llxuiparser.cpp @@ -61,8 +61,6 @@ const S32 LINE_NUMBER_HERE = 0; struct MaxOccursValues : public LLInitParam::TypeValuesHelper<U32, MaxOccursValues> { - using TypeValuesHelper<U32, MaxOccursValues>::operator =; - typedef std::string name_t; static void declareValues() { declare("unbounded", U32_MAX); @@ -73,11 +71,11 @@ struct Occurs : public LLInitParam::Block<Occurs> { Optional<U32> minOccurs; Optional<U32, MaxOccursValues> maxOccurs; - Multiple<U32, AnyAmount, MaxOccursValues> foo; Occurs() : minOccurs("minOccurs", 0), maxOccurs("maxOccurs", U32_MAX) + {} }; |