diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 20:03:14 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 20:03:14 +0200 |
| commit | e4f6e7d842698c66061143283562dc86eec00405 (patch) | |
| tree | dafe34b658b91b934bd7174e8cb164f85e2ce57d /indra/llcommon/llinitparam.h | |
| parent | 3e0e141b7651a8ed20ec310fa4557d2a5c9fcd89 (diff) | |
| parent | 03db2ddc9c27cf842c6185826617b0da0d2b87f5 (diff) | |
Merged in lindenlab/viewer-release and incremented viewer version to 6.2.0
Diffstat (limited to 'indra/llcommon/llinitparam.h')
| -rw-r--r-- | indra/llcommon/llinitparam.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/llinitparam.h b/indra/llcommon/llinitparam.h index f1f4226c40..7f5b9b4ac2 100644 --- a/indra/llcommon/llinitparam.h +++ b/indra/llcommon/llinitparam.h @@ -2115,6 +2115,9 @@ namespace LLInitParam typedef typename super_t::iterator iterator; typedef typename super_t::const_iterator const_iterator; + using super_t::operator(); + using super_t::operator const container_t&; + explicit Multiple(const char* name = "") : super_t(DERIVED_BLOCK::getBlockDescriptor(), name, container_t(), &validate, RANGE::minCount, RANGE::maxCount) {} |