diff options
| author | Richard Linden <none@none> | 2011-04-28 14:57:34 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-28 14:57:34 -0700 |
| commit | 1128a15f0be3e12104fdb49e0a3417ecea6faccb (patch) | |
| tree | fc3abb220a227892bde9924aeeca5016ec44b99b /indra/llxuixml/llinitparam.cpp | |
| parent | e1e736eff89a279114d3fdc0381e1b669ea5a406 (diff) | |
| parent | 31a2923b3d96ed4a04d0b27018fc71d0d66b6a5b (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge/
Diffstat (limited to 'indra/llxuixml/llinitparam.cpp')
| -rw-r--r-- | indra/llxuixml/llinitparam.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index 3c4eb70a5d..b3312798dd 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -375,7 +375,7 @@ namespace LLInitParam //static void BaseBlock::addParam(BlockDescriptor& block_data, const ParamDescriptorPtr in_param, const char* char_name) { - // create a copy of the paramdescriptor in allparams + // create a copy of the param descriptor in mAllParams // so other data structures can store a pointer to it block_data.mAllParams.push_back(in_param); ParamDescriptorPtr param(block_data.mAllParams.back()); @@ -469,7 +469,7 @@ namespace LLInitParam // take all provided params from other and apply to self // NOTE: this requires that "other" is of the same derived type as this - bool BaseBlock::merge(BlockDescriptor& block_data, const BaseBlock& other, bool overwrite) + bool BaseBlock::mergeBlock(BlockDescriptor& block_data, const BaseBlock& other, bool overwrite) { bool some_param_changed = false; BlockDescriptor::all_params_list_t::const_iterator end_it = block_data.mAllParams.end(); |