diff options
| -rw-r--r-- | indra/llxuixml/llinitparam.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 575e8231bd..2edb9b98c7 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -945,6 +945,12 @@ namespace LLInitParam return static_cast<self_t&>(param_value_t::operator =(name)); } + self_t& operator =(value_assignment_t val) + { + set(val); + return *this; + } + protected: static bool mergeWith(Param& dst, const Param& src, bool overwrite) { @@ -1086,6 +1092,12 @@ namespace LLInitParam return static_cast<self_t&>(param_value_t::operator =(name)); } + self_t& operator =(value_assignment_t val) + { + set(val); + return *this; + } + // propagate changed status up to enclosing block /*virtual*/ void paramChanged(const Param& changed_param, bool user_provided) { @@ -1290,12 +1302,6 @@ namespace LLInitParam } protected: - self_t& operator=(const self_t& other) - { - mValues = other.mValues; - return *this; - } - static bool mergeWith(Param& dst, const Param& src, bool overwrite) { const self_t& src_typed_param = static_cast<const self_t&>(src); @@ -1489,11 +1495,6 @@ namespace LLInitParam } protected: - self_t& operator=(const self_t& other) - { - mValues = other.mValues; - return *this; - } static bool mergeWith(Param& dst, const Param& src, bool overwrite) { |